enlightenment
/
expedite
7
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

2to3 modifications to expedite-cmp 

Summary: Make expedite-cmp runnable with py3

Reviewers: cedric, bu5hm4n, zmike

Differential Revision: https://phab.enlightenment.org/D8700
This commit is contained in:
Lauro Moura 2019-04-24 11:43:49 -03:00
parent 555b18dbaa
commit 5f0cc9df1d
1 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/bin/expedite-cmp
View File

@ -1,5 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
from __future__ import print_function
import sys import sys
import os import os
import os.path import os.path
@ -68,12 +70,12 @@ def report_text():
fmtsize = len(options.format % {"value": 12345.67, "percentual": 1234.56}) fmtsize = len(options.format % {"value": 12345.67, "percentual": 1234.56})
hdrfmt = "%%%d.%ds" % (fmtsize, fmtsize) hdrfmt = "%%%d.%ds" % (fmtsize, fmtsize)
print test_name_fmt % "\\", print(test_name_fmt % "\\", end=' ')
print "%7.7s" % (files[0][-7:],), print("%7.7s" % (files[0][-7:],), end=' ')
for f in files[1:]: for f in files[1:]:
n, e = os.path.splitext(f) n, e = os.path.splitext(f)
print hdrfmt % n[-fmtsize:], print(hdrfmt % n[-fmtsize:], end=' ')
print print()
if options.color and os.environ.get("TERM", "") in ( if options.color and os.environ.get("TERM", "") in (
"xterm", "xterm-color", "rxvt", "rxvt-unicode", "screen", "xterm", "xterm-color", "rxvt", "rxvt-unicode", "screen",
@ -90,14 +92,14 @@ def report_text():
def print_row(test): def print_row(test):
print test_name_fmt % test, print(test_name_fmt % test, end=' ')
ref_val = data[ref_f][test] ref_val = data[ref_f][test]
print "%7.2f" % ref_val, print("%7.2f" % ref_val, end=' ')
for f in others_f: for f in others_f:
try: try:
val = data[f][test] val = data[f][test]
except KeyError: except KeyError:
print "-?????-", print("-?????-", end=' ')
continue continue
percent = (val - ref_val) / ref_val percent = (val - ref_val) / ref_val
@ -111,9 +113,9 @@ def report_text():
fmt = options.format % {"value": val, "percentual": percent * 100} fmt = options.format % {"value": val, "percentual": percent * 100}
if len(fmt) < fmtsize: if len(fmt) < fmtsize:
fmt = hdrfmt % fmt fmt = hdrfmt % fmt
print "%s%s%s" % (c, fmt, color_reset), print("%s%s%s" % (c, fmt, color_reset), end=' ')
print print()
for t in tests: for t in tests:
print_row(t) print_row(t)
@ -123,7 +125,7 @@ def report_html():
import time import time
fnames = [os.path.basename(f) for f in files] fnames = [os.path.basename(f) for f in files]
print """\ print("""\
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@ -156,9 +158,9 @@ def report_html():
border-bottom: 1px dashed #ccc; border-bottom: 1px dashed #ccc;
} }
td.test-name, thead tr td { text-align: right; }\ td.test-name, thead tr td { text-align: right; }\
""" """)
if options.color: if options.color:
print """\ print("""\
td.value-good { background-color: #aaffaa; } td.value-good { background-color: #aaffaa; }
td.value-bad { background-color: #ffaaaa; } td.value-bad { background-color: #ffaaaa; }
td.value-missing { background-color: #ffffaa; } td.value-missing { background-color: #ffffaa; }
@ -168,9 +170,9 @@ def report_html():
background-color: #d9d9d9; background-color: #d9d9d9;
border-bottom: 1px dashed #ccc; border-bottom: 1px dashed #ccc;
} }
""" """)
print """ print("""
</style> </style>
<body> <body>
<p>Comparison sheet for %(files)s, created at %(date)s.</p> <p>Comparison sheet for %(files)s, created at %(date)s.</p>
@ -180,17 +182,17 @@ def report_html():
<td>\\</td>\ <td>\\</td>\
""" % {"files": ", ".join(fnames), """ % {"files": ", ".join(fnames),
"date": time.asctime(), "date": time.asctime(),
} })
for f in fnames: for f in fnames:
print """\ print("""\
<td>%s</td>\ <td>%s</td>\
""" % f """ % f)
print """\ print("""\
</tr> </tr>
</thead> </thead>
<tbody>\ <tbody>\
""" """)
def print_row(test): def print_row(test):
ref_val = data[ref_f][test] ref_val = data[ref_f][test]
@ -199,19 +201,19 @@ def report_html():
else: else:
extra_cls = "" extra_cls = ""
print """\ print("""\
<tr%s> <tr%s>
<td class="test-name">%s</td> <td class="test-name">%s</td>
<td class="value-reference">%7.2f</td>\ <td class="value-reference">%7.2f</td>\
""" % (extra_cls, test, ref_val) """ % (extra_cls, test, ref_val))
for f in others_f: for f in others_f:
try: try:
val = data[f][test] val = data[f][test]
except KeyError: except KeyError:
print """\ print("""\
<td class="value-missing">-?????-</td>\ <td class="value-missing">-?????-</td>\
""" """)
continue continue
percent = (val - ref_val) / ref_val percent = (val - ref_val) / ref_val
@ -224,23 +226,23 @@ def report_html():
v = options.format % {"value": val, "percentual": percent * 100} v = options.format % {"value": val, "percentual": percent * 100}
print """\ print("""\
<td class="value-%s">%s</td>\ <td class="value-%s">%s</td>\
""" % (c, v) """ % (c, v))
print """\ print("""\
</tr>\ </tr>\
""" """)
for t in tests: for t in tests:
print_row(t) print_row(t)
print """\ print("""\
</tbody> </tbody>
</table> </table>
</body> </body>
</html> </html>
""" """)
if options.report == "text": if options.report == "text":
report_text() report_text()