jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix py26 by using indices in str.format

This commit is contained in:
Raphael Pierzina 2016-06-12 00:52:03 +01:00
parent bbc6c18448
commit b99aace8a9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
_pytest/python.py
View File

@ -1229,12 +1229,12 @@ def _show_fixtures_per_test(config, session):
return return
if verbose > 0: if verbose > 0:
bestrel = get_best_rel(fixture_def.func) bestrel = get_best_rel(fixture_def.func)
funcargspec = "{} -- {}".format(argname, bestrel) funcargspec = "{0} -- {1}".format(argname, bestrel)
else: else:
funcargspec = argname funcargspec = argname
tw.line(funcargspec, green=True) tw.line(funcargspec, green=True)
INDENT = ' {}' INDENT = ' {0}'
fixture_doc = fixture_def.func.__doc__ fixture_doc = fixture_def.func.__doc__
if fixture_doc: if fixture_doc:
@ -1252,8 +1252,8 @@ def _show_fixtures_per_test(config, session):
bestrel = get_best_rel(item.function) bestrel = get_best_rel(item.function)
tw.line() tw.line()
tw.sep('-', 'fixtures used by {}'.format(item.name)) tw.sep('-', 'fixtures used by {0}'.format(item.name))
tw.sep('-', 'from {}'.format(bestrel)) tw.sep('-', 'from {0}'.format(bestrel))
for argname, fixture_defs in sorted(name2fixturedefs.items()): for argname, fixture_defs in sorted(name2fixturedefs.items()):
assert fixture_defs is not None assert fixture_defs is not None
if not fixture_defs: if not fixture_defs: