Fixed E125 flake8 errors
continuation line with same indent as next logical line
This commit is contained in:
parent
051d76a63f
commit
92e2cd9c68
|
@ -339,8 +339,8 @@ class Traceback(list):
|
||||||
loc = f.f_locals
|
loc = f.f_locals
|
||||||
for otherloc in l:
|
for otherloc in l:
|
||||||
if f.is_true(f.eval(co_equal,
|
if f.is_true(f.eval(co_equal,
|
||||||
__recursioncache_locals_1=loc,
|
__recursioncache_locals_1=loc,
|
||||||
__recursioncache_locals_2=otherloc)):
|
__recursioncache_locals_2=otherloc)):
|
||||||
return i
|
return i
|
||||||
l.append(entry.frame.f_locals)
|
l.append(entry.frame.f_locals)
|
||||||
return None
|
return None
|
||||||
|
|
|
@ -205,7 +205,7 @@ def slice_items(items, ignore, scoped_argkeys_cache):
|
||||||
for item in it:
|
for item in it:
|
||||||
argkeys = scoped_argkeys_cache.get(item)
|
argkeys = scoped_argkeys_cache.get(item)
|
||||||
if argkeys and slicing_argkey in argkeys and \
|
if argkeys and slicing_argkey in argkeys and \
|
||||||
slicing_argkey not in ignore:
|
slicing_argkey not in ignore:
|
||||||
items_same.append(item)
|
items_same.append(item)
|
||||||
else:
|
else:
|
||||||
items_other.append(item)
|
items_other.append(item)
|
||||||
|
|
|
@ -264,7 +264,7 @@ class HookRecorder:
|
||||||
return [x.report for x in self.getcalls(names)]
|
return [x.report for x in self.getcalls(names)]
|
||||||
|
|
||||||
def matchreport(self, inamepart="",
|
def matchreport(self, inamepart="",
|
||||||
names="pytest_runtest_logreport pytest_collectreport", when=None):
|
names="pytest_runtest_logreport pytest_collectreport", when=None):
|
||||||
""" return a testreport whose dotted import path matches """
|
""" return a testreport whose dotted import path matches """
|
||||||
l = []
|
l = []
|
||||||
for rep in self.getreports(names=names):
|
for rep in self.getreports(names=names):
|
||||||
|
@ -298,7 +298,7 @@ class HookRecorder:
|
||||||
skipped = []
|
skipped = []
|
||||||
failed = []
|
failed = []
|
||||||
for rep in self.getreports(
|
for rep in self.getreports(
|
||||||
"pytest_collectreport pytest_runtest_logreport"):
|
"pytest_collectreport pytest_runtest_logreport"):
|
||||||
if rep.passed:
|
if rep.passed:
|
||||||
if getattr(rep, "when", None) == "call":
|
if getattr(rep, "when", None) == "call":
|
||||||
passed.append(rep)
|
passed.append(rep)
|
||||||
|
|
|
@ -737,7 +737,7 @@ class Metafunc(fixtures.FuncargnamesCompatAttr):
|
||||||
self._arg2fixturedefs = fixtureinfo.name2fixturedefs
|
self._arg2fixturedefs = fixtureinfo.name2fixturedefs
|
||||||
|
|
||||||
def parametrize(self, argnames, argvalues, indirect=False, ids=None,
|
def parametrize(self, argnames, argvalues, indirect=False, ids=None,
|
||||||
scope=None):
|
scope=None):
|
||||||
""" Add new invocations to the underlying test function using the list
|
""" Add new invocations to the underlying test function using the list
|
||||||
of argvalues for the given argnames. Parametrization is performed
|
of argvalues for the given argnames. Parametrization is performed
|
||||||
during the collection phase. If you need to setup expensive resources
|
during the collection phase. If you need to setup expensive resources
|
||||||
|
|
|
@ -243,7 +243,7 @@ def pytest_runtest_makereport(item, call):
|
||||||
rep.wasxfail = "reason: " + call.excinfo.value.msg
|
rep.wasxfail = "reason: " + call.excinfo.value.msg
|
||||||
rep.outcome = "skipped"
|
rep.outcome = "skipped"
|
||||||
elif evalxfail and not rep.skipped and evalxfail.wasvalid() and \
|
elif evalxfail and not rep.skipped and evalxfail.wasvalid() and \
|
||||||
evalxfail.istrue():
|
evalxfail.istrue():
|
||||||
if call.excinfo:
|
if call.excinfo:
|
||||||
if evalxfail.invalidraise(call.excinfo.value):
|
if evalxfail.invalidraise(call.excinfo.value):
|
||||||
rep.outcome = "failed"
|
rep.outcome = "failed"
|
||||||
|
|
|
@ -210,7 +210,7 @@ def pytest_runtest_protocol(item):
|
||||||
check_testcase_implements_trial_reporter()
|
check_testcase_implements_trial_reporter()
|
||||||
|
|
||||||
def excstore(self, exc_value=None, exc_type=None, exc_tb=None,
|
def excstore(self, exc_value=None, exc_type=None, exc_tb=None,
|
||||||
captureVars=None):
|
captureVars=None):
|
||||||
if exc_value is None:
|
if exc_value is None:
|
||||||
self._rawexcinfo = sys.exc_info()
|
self._rawexcinfo = sys.exc_info()
|
||||||
else:
|
else:
|
||||||
|
|
2
tox.ini
2
tox.ini
|
@ -196,6 +196,6 @@ filterwarnings =
|
||||||
ignore:.*inspect.getargspec.*deprecated, use inspect.signature.*:DeprecationWarning
|
ignore:.*inspect.getargspec.*deprecated, use inspect.signature.*:DeprecationWarning
|
||||||
|
|
||||||
[flake8]
|
[flake8]
|
||||||
ignore = E125,E126,E127,E128,E129,E131,E201,E202,E203,E221,E222,E225,E226,E231,E241,E251,E261,E262,E265,E271,E272,E293,E301,E302,E303,E401,E402,E501,E701,E702,E704,E712,E731
|
ignore = E126,E127,E128,E129,E131,E201,E202,E203,E221,E222,E225,E226,E231,E241,E251,E261,E262,E265,E271,E272,E293,E301,E302,E303,E401,E402,E501,E701,E702,E704,E712,E731
|
||||||
max-line-length = 120
|
max-line-length = 120
|
||||||
exclude = _pytest/vendored_packages/pluggy.py
|
exclude = _pytest/vendored_packages/pluggy.py
|
||||||
|
|
Loading…
Reference in New Issue