tbl.newColumn(m, metrix_table[m][0], align = "center")
needNewRow = True
- for case in sorted(tests):
+ for case in sorted(tests, key=lambda x: str(x)):
if needNewRow:
tbl.newRow()
if not options.showall:
prevGroupName = None
needNewRow = True
lastRow = None
- for name in sorted(test_cases.iterkeys(), key=alphanum_keyselector):
+ for name in sorted(test_cases.keys(), key=alphanum_keyselector):
cases = test_cases[name]
if needNewRow:
lastRow = tbl.newRow()
def layoutTable(self):
columns = self.columns.values()
- columns.sort(key=lambda c: c.index)
+ columns = sorted(columns, key=lambda c: c.index)
colspanned = []
rowspanned = []
cell.width = len(max(cell.text, key = lambda line: len(line)))
def reformatTextValue(self, value):
- if sys.version_info > (3,): # PY3 fix
+ if sys.version_info >= (2,7):
unicode = str
if isinstance(value, str):
vstr = value
if align == "right":
pattern = "%" + str(width) + "s"
elif align == "center":
- pattern = "%" + str((width - len(line)) / 2 + len(line)) + "s" + " " * (width - len(line) - (width - len(line)) / 2)
+ pattern = "%" + str((width - len(line)) // 2 + len(line)) + "s" + " " * (width - len(line) - (width - len(line)) // 2)
else:
pattern = "%-" + str(width) + "s"
if valign == "bottom":
return height - space
if valign == "middle":
- return (height - space + 1) / 2
+ return (height - space + 1) // 2
return 0
def htmlPrintTable(self, out, embeedcss = False):
if attr_name.startswith('cv_')
}
- tests = map(TestInfo, log.getElementsByTagName("testcase"))
+ tests = list(map(TestInfo, log.getElementsByTagName("testcase")))
return TestRunInfo(properties, tests)