Avoid wasted string concatenation and improve english

This commit is contained in:
Floris Bruynooghe 2014-01-29 00:39:04 +00:00
parent 86284689a3
commit cc1186242c
1 changed files with 2 additions and 2 deletions

View File

@ -80,10 +80,10 @@ def pytest_runtest_setup(item):
if new_expl: if new_expl:
# Don't include pageloads of data unless we are very # Don't include pageloads of data unless we are very
# verbose (-vv) # verbose (-vv)
if (len(py.builtin._totext('').join(new_expl[1:])) > 80*8 if (sum(len(p) for p in new_expl[1:]) > 80*8
and item.config.option.verbose < 2): and item.config.option.verbose < 2):
new_expl[1:] = [py.builtin._totext( new_expl[1:] = [py.builtin._totext(
'Detailed information truncated, use "-vv" to see')] 'Detailed information truncated, use "-vv" to show')]
res = py.builtin._totext('\n~').join(new_expl) res = py.builtin._totext('\n~').join(new_expl)
if item.config.getvalue("assertmode") == "rewrite": if item.config.getvalue("assertmode") == "rewrite":
# The result will be fed back a python % formatting # The result will be fed back a python % formatting