From 425665cf25dd9a3f20982287338ca8e770531872 Mon Sep 17 00:00:00 2001 From: Andras Tim Date: Mon, 17 Jul 2017 01:25:07 +0200 Subject: [PATCH] Fixed E122 flake8 errors continuation line missing indentation or outdented --- _pytest/config.py | 4 ++-- _pytest/helpconfig.py | 6 +++--- testing/python/fixture.py | 2 +- testing/test_assertrewrite.py | 2 +- testing/test_terminal.py | 4 ++-- tox.ini | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/_pytest/config.py b/_pytest/config.py index dadd5ca9d..a07174d72 100644 --- a/_pytest/config.py +++ b/_pytest/config.py @@ -1093,8 +1093,8 @@ class Config(object): if myver < ver: raise pytest.UsageError( "%s:%d: requires pytest-%s, actual pytest-%s'" %( - self.inicfg.config.path, self.inicfg.lineof('minversion'), - minver, pytest.__version__)) + self.inicfg.config.path, self.inicfg.lineof('minversion'), + minver, pytest.__version__)) def parse(self, args, addopts=True): # parse given cmdline arguments into this config object. diff --git a/_pytest/helpconfig.py b/_pytest/helpconfig.py index e3c6b6e99..240fa67cc 100644 --- a/_pytest/helpconfig.py +++ b/_pytest/helpconfig.py @@ -70,9 +70,9 @@ def pytest_cmdline_parse(): debugfile = open(path, 'w') debugfile.write("versions pytest-%s, py-%s, " "python-%s\ncwd=%s\nargs=%s\n\n" %( - pytest.__version__, py.__version__, - ".".join(map(str, sys.version_info)), - os.getcwd(), config._origargs)) + pytest.__version__, py.__version__, + ".".join(map(str, sys.version_info)), + os.getcwd(), config._origargs)) config.trace.root.setwriter(debugfile.write) undo_tracing = config.pluginmanager.enable_tracing() sys.stderr.write("writing pytestdebug information to %s\n" % path) diff --git a/testing/python/fixture.py b/testing/python/fixture.py index de41aaca1..ff6a6915a 100644 --- a/testing/python/fixture.py +++ b/testing/python/fixture.py @@ -2243,7 +2243,7 @@ class TestFixtureMarker(object): 'fin:mod1', 'create:mod2', 'test2', 'create:1', 'test3', 'fin:1', 'create:2', 'test3', 'fin:2', 'create:1', 'test4', 'fin:1', 'create:2', 'test4', 'fin:2', - 'fin:mod2'] + 'fin:mod2'] import pprint pprint.pprint(list(zip(l, expected))) assert l == expected diff --git a/testing/test_assertrewrite.py b/testing/test_assertrewrite.py index 8aee520b3..52f97964e 100644 --- a/testing/test_assertrewrite.py +++ b/testing/test_assertrewrite.py @@ -556,7 +556,7 @@ class TestRewriteOnImport(object): def test_readonly(self, testdir): sub = testdir.mkdir("testing") sub.join("test_readonly.py").write( - py.builtin._totext(""" + py.builtin._totext(""" def test_rewritten(): assert "@py_builtins" in globals() """).encode("utf-8"), "wb") diff --git a/testing/test_terminal.py b/testing/test_terminal.py index 51c8d642e..27d46add4 100644 --- a/testing/test_terminal.py +++ b/testing/test_terminal.py @@ -77,8 +77,8 @@ class TestTerminal(object): ]) else: result.stdout.fnmatch_lines([ - "*test_pass_skip_fail.py .sF" - ]) + "*test_pass_skip_fail.py .sF" + ]) result.stdout.fnmatch_lines([ " def test_func():", "> assert 0", diff --git a/tox.ini b/tox.ini index 573eddac4..dec64c85f 100644 --- a/tox.ini +++ b/tox.ini @@ -196,6 +196,6 @@ filterwarnings = ignore:.*inspect.getargspec.*deprecated, use inspect.signature.*:DeprecationWarning [flake8] -ignore = E122,E123,E124,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 = E123,E124,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 max-line-length = 120 exclude = _pytest/vendored_packages/pluggy.py