This patch, generated by /usr/bin/2to3-3.9, converts the script
from python-2 to python-3.
--- expedite-1.7.10/src/bin/expedite-cmp-orig Mon Jul 29 12:14:52 2013
+++ expedite-1.7.10/src/bin/expedite-cmp Thu Mar 17 10:42:21 2022
@@ -68,12 +68,12 @@
fmtsize = len(options.format % {"value": 12345.67, "percentual": 1234.56})
hdrfmt = "%%%d.%ds" % (fmtsize, fmtsize)
- print test_name_fmt % "\\",
- print "%7.7s" % (files[0][-7:],),
+ print(test_name_fmt % "\\", end=' ')
+ print("%7.7s" % (files[0][-7:],), end=' ')
for f in files[1:]:
n, e = os.path.splitext(f)
- print hdrfmt % n[-fmtsize:],
- print
+ print(hdrfmt % n[-fmtsize:], end=' ')
+ print()
if options.color and os.environ.get("TERM", "") in (
"xterm", "xterm-color", "rxvt", "rxvt-unicode", "screen",
@@ -90,14 +90,14 @@
def print_row(test):
- print test_name_fmt % test,
+ print(test_name_fmt % test, end=' ')
ref_val = data[ref_f][test]
- print "%7.2f" % ref_val,
+ print("%7.2f" % ref_val, end=' ')
for f in others_f:
try:
val = data[f][test]
except KeyError:
- print "-?????-",
+ print("-?????-", end=' ')
continue
percent = (val - ref_val) / ref_val
@@ -111,9 +111,9 @@
fmt = options.format % {"value": val, "percentual": percent * 100}
if len(fmt) < fmtsize:
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:
print_row(t)
@@ -123,7 +123,7 @@
import time
fnames = [os.path.basename(f) for f in files]
- print """\
+ print("""\
@@ -156,9 +156,9 @@
border-bottom: 1px dashed #ccc;
}
td.test-name, thead tr td { text-align: right; }\
-"""
+""")
if options.color:
- print """\
+ print("""\
td.value-good { background-color: #aaffaa; }
td.value-bad { background-color: #ffaaaa; }
td.value-missing { background-color: #ffffaa; }
@@ -168,9 +168,9 @@
background-color: #d9d9d9;
border-bottom: 1px dashed #ccc;
}
-"""
+""")
- print """
+ print("""
Comparison sheet for %(files)s, created at %(date)s.
@@ -180,17 +180,17 @@
\\ | \
""" % {"files": ", ".join(fnames),
"date": time.asctime(),
- }
+ })
for f in fnames:
- print """\
+ print("""\
%s | \
-""" % f
- print """\
+""" % f)
+ print("""\
\
-"""
+""")
def print_row(test):
ref_val = data[ref_f][test]
@@ -199,19 +199,19 @@
else:
extra_cls = ""
- print """\
+ print("""\
%s |
%7.2f | \
-""" % (extra_cls, test, ref_val)
+""" % (extra_cls, test, ref_val))
for f in others_f:
try:
val = data[f][test]
except KeyError:
- print """\
+ print("""\
-?????- | \
-"""
+""")
continue
percent = (val - ref_val) / ref_val
@@ -224,23 +224,23 @@
v = options.format % {"value": val, "percentual": percent * 100}
- print """\
+ print("""\
%s | \
-""" % (c, v)
+""" % (c, v))
- print """\
+ print("""\
\
-"""
+""")
for t in tests:
print_row(t)
- print """\
+ print("""\