forked from qt-creator/qt-creator
Scripts: Fix output for python 3
Change-Id: Ie914e04b25bdd4e41a9d2b3a9002385f5867ad6b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -181,6 +181,15 @@ def diffContext(ctx, old, new):
|
|||||||
|
|
||||||
return report
|
return report
|
||||||
|
|
||||||
|
|
||||||
|
def stringify(obj):
|
||||||
|
stringTypes = (str, unicode) if sys.version_info.major == 2 else (str)
|
||||||
|
if isinstance(obj, stringTypes):
|
||||||
|
return obj
|
||||||
|
if isinstance(obj, bytes):
|
||||||
|
tmp = obj.decode('cp1252') if platform.system() in ('Microsoft','Windows') else obj.decode()
|
||||||
|
return tmp
|
||||||
|
|
||||||
# --- The main program
|
# --- The main program
|
||||||
|
|
||||||
oldGenerator = Generator()
|
oldGenerator = Generator()
|
||||||
@@ -203,21 +212,21 @@ newContextSet = set(newTree.keys())
|
|||||||
for c in sorted(oldContextSet.difference(newContextSet)):
|
for c in sorted(oldContextSet.difference(newContextSet)):
|
||||||
report = diffContext(c, oldTree[c], {})
|
report = diffContext(c, oldTree[c], {})
|
||||||
if report:
|
if report:
|
||||||
print(report.encode('utf-8'))
|
print(stringify(report.encode('utf-8')))
|
||||||
else:
|
else:
|
||||||
unchangedContexts += 1
|
unchangedContexts += 1
|
||||||
|
|
||||||
for c in sorted(newContextSet.difference(oldContextSet)):
|
for c in sorted(newContextSet.difference(oldContextSet)):
|
||||||
report = diffContext(c, {}, newTree[c])
|
report = diffContext(c, {}, newTree[c])
|
||||||
if report:
|
if report:
|
||||||
print(report.encode('utf-8'))
|
print(stringify(report.encode('utf-8')))
|
||||||
else:
|
else:
|
||||||
unchangedContexts += 1
|
unchangedContexts += 1
|
||||||
|
|
||||||
for c in sorted(newContextSet.intersection(oldContextSet)):
|
for c in sorted(newContextSet.intersection(oldContextSet)):
|
||||||
report = diffContext(c, oldTree[c], newTree[c])
|
report = diffContext(c, oldTree[c], newTree[c])
|
||||||
if report:
|
if report:
|
||||||
print(report.encode('utf-8'))
|
print(stringify(report.encode('utf-8')))
|
||||||
else:
|
else:
|
||||||
unchangedContexts += 1
|
unchangedContexts += 1
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user