From c14a23d4e46810e613401ec095803debcf3b4af5 Mon Sep 17 00:00:00 2001 From: Niklas JQ Date: Wed, 10 Oct 2018 19:28:31 +0200 Subject: [PATCH] Fix #4093: multiple string literals on a line --- doc/en/example/assertion/failure_demo.py | 2 +- doc/en/example/reportingdemo.rst | 2 +- src/_pytest/assertion/util.py | 2 +- src/_pytest/cacheprovider.py | 2 +- src/_pytest/capture.py | 2 +- src/_pytest/compat.py | 2 +- src/_pytest/deprecated.py | 2 +- src/_pytest/helpconfig.py | 2 +- src/_pytest/python.py | 2 +- src/_pytest/recwarn.py | 2 +- src/_pytest/terminal.py | 2 +- testing/acceptance_test.py | 6 +++--- testing/logging/test_formatter.py | 4 ++-- testing/test_junitxml.py | 2 +- testing/test_pdb.py | 2 +- 15 files changed, 18 insertions(+), 18 deletions(-) diff --git a/doc/en/example/assertion/failure_demo.py b/doc/en/example/assertion/failure_demo.py index 33fff5565..5dff265a5 100644 --- a/doc/en/example/assertion/failure_demo.py +++ b/doc/en/example/assertion/failure_demo.py @@ -246,7 +246,7 @@ class TestCustomAssertMsg(object): b = 2 assert A.a == b, ( - "A.a appears not to be b\n" "or does not appear to be b\none of those" + "A.a appears not to be b\nor does not appear to be b\none of those" ) def test_custom_repr(self): diff --git a/doc/en/example/reportingdemo.rst b/doc/en/example/reportingdemo.rst index a411aa49a..fb117d06c 100644 --- a/doc/en/example/reportingdemo.rst +++ b/doc/en/example/reportingdemo.rst @@ -582,7 +582,7 @@ get on the terminal - we are working on that):: b = 2 > assert ( A.a == b - ), "A.a appears not to be b\n" "or does not appear to be b\none of those" + ), "A.a appears not to be b\nor does not appear to be b\none of those" E AssertionError: A.a appears not to be b E or does not appear to be b E one of those diff --git a/src/_pytest/assertion/util.py b/src/_pytest/assertion/util.py index a3013cb98..15724ed32 100644 --- a/src/_pytest/assertion/util.py +++ b/src/_pytest/assertion/util.py @@ -199,7 +199,7 @@ def _diff_text(left, right, verbose=False): if i > 42: i -= 10 # Provide some context explanation = [ - u("Skipping %s identical leading " "characters in diff, use -v to show") + u("Skipping %s identical leading characters in diff, use -v to show") % i ] left = left[i:] diff --git a/src/_pytest/cacheprovider.py b/src/_pytest/cacheprovider.py index 87e24894b..dc71303c0 100755 --- a/src/_pytest/cacheprovider.py +++ b/src/_pytest/cacheprovider.py @@ -344,7 +344,7 @@ def cacheshow(config, session): key = valpath.relative_to(vdir) val = config.cache.get(key, dummy) if val is dummy: - tw.line("%s contains unreadable content, " "will be ignored" % key) + tw.line("%s contains unreadable content, will be ignored" % key) else: tw.line("%s contains:" % key) for line in pformat(val).splitlines(): diff --git a/src/_pytest/capture.py b/src/_pytest/capture.py index 97b88ee9d..dfb488968 100644 --- a/src/_pytest/capture.py +++ b/src/_pytest/capture.py @@ -654,7 +654,7 @@ class DontReadFromInput(six.Iterator): return self def fileno(self): - raise UnsupportedOperation("redirected stdin is pseudofile, " "has no fileno()") + raise UnsupportedOperation("redirected stdin is pseudofile, has no fileno()") def isatty(self): return False diff --git a/src/_pytest/compat.py b/src/_pytest/compat.py index 02cad24cc..6f48cdc3f 100644 --- a/src/_pytest/compat.py +++ b/src/_pytest/compat.py @@ -275,7 +275,7 @@ def get_real_func(obj): obj = new_obj else: raise ValueError( - ("could not find real function of {start}" "\nstopped at {current}").format( + ("could not find real function of {start}\nstopped at {current}").format( start=py.io.saferepr(start_obj), current=py.io.saferepr(obj) ) ) diff --git a/src/_pytest/deprecated.py b/src/_pytest/deprecated.py index dea8bbde8..c26cf4879 100644 --- a/src/_pytest/deprecated.py +++ b/src/_pytest/deprecated.py @@ -64,7 +64,7 @@ RECORD_XML_PROPERTY = RemovedInPytest4Warning( ) COLLECTOR_MAKEITEM = RemovedInPytest4Warning( - "pycollector makeitem was removed " "as it is an accidentially leaked internal api" + "pycollector makeitem was removed as it is an accidentially leaked internal api" ) METAFUNC_ADD_CALL = RemovedInPytest4Warning( diff --git a/src/_pytest/helpconfig.py b/src/_pytest/helpconfig.py index 85f071e9e..88bef95fc 100644 --- a/src/_pytest/helpconfig.py +++ b/src/_pytest/helpconfig.py @@ -139,7 +139,7 @@ def showhelp(config): tw.line() tw.line() tw.line( - "[pytest] ini-options in the first " "pytest.ini|tox.ini|setup.cfg file found:" + "[pytest] ini-options in the first pytest.ini|tox.ini|setup.cfg file found:" ) tw.line() diff --git a/src/_pytest/python.py b/src/_pytest/python.py index e83ea7a26..0717301ed 100644 --- a/src/_pytest/python.py +++ b/src/_pytest/python.py @@ -131,7 +131,7 @@ def pytest_addoption(parser): "python_functions", type="args", default=["test"], - help="prefixes or glob names for Python test function and " "method discovery", + help="prefixes or glob names for Python test function and method discovery", ) group.addoption( diff --git a/src/_pytest/recwarn.py b/src/_pytest/recwarn.py index 7a0586697..e1b674fa8 100644 --- a/src/_pytest/recwarn.py +++ b/src/_pytest/recwarn.py @@ -196,7 +196,7 @@ class WarningsChecker(WarningsRecorder): def __init__(self, expected_warning=None, match_expr=None): super(WarningsChecker, self).__init__() - msg = "exceptions must be old-style classes or " "derived from Warning, not %s" + msg = "exceptions must be old-style classes or derived from Warning, not %s" if isinstance(expected_warning, tuple): for exc in expected_warning: if not inspect.isclass(exc): diff --git a/src/_pytest/terminal.py b/src/_pytest/terminal.py index 125eb97c4..a7a45da57 100644 --- a/src/_pytest/terminal.py +++ b/src/_pytest/terminal.py @@ -836,7 +836,7 @@ def repr_pythonversion(v=None): def build_summary_stats_line(stats): keys = ( - "failed passed skipped deselected " "xfailed xpassed warnings error" + "failed passed skipped deselected xfailed xpassed warnings error" ).split() unknown_key_seen = False for key in stats.keys(): diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py index 332af27b5..b0d0a7e61 100644 --- a/testing/acceptance_test.py +++ b/testing/acceptance_test.py @@ -608,7 +608,7 @@ class TestInvocationVariants(object): lib = ns.mkdir(dirname) lib.ensure("__init__.py") lib.join("test_{}.py".format(dirname)).write( - "def test_{}(): pass\n" "def test_other():pass".format(dirname) + "def test_{}(): pass\ndef test_other():pass".format(dirname) ) # The structure of the test directory is now: @@ -697,10 +697,10 @@ class TestInvocationVariants(object): lib = foo.mkdir("bar") lib.ensure("__init__.py") lib.join("test_bar.py").write( - "def test_bar(): pass\n" "def test_other(a_fixture):pass" + "def test_bar(): pass\ndef test_other(a_fixture):pass" ) lib.join("conftest.py").write( - "import pytest\n" "@pytest.fixture\n" "def a_fixture():pass" + "import pytest\n@pytest.fixture\ndef a_fixture():pass" ) d_local = testdir.mkdir("local") diff --git a/testing/logging/test_formatter.py b/testing/logging/test_formatter.py index 0348b215c..84ef4dd2f 100644 --- a/testing/logging/test_formatter.py +++ b/testing/logging/test_formatter.py @@ -26,10 +26,10 @@ def test_coloredlogformatter(): formatter = ColoredLevelFormatter(tw, logfmt) output = formatter.format(record) assert output == ( - "dummypath 10 " "\x1b[32mINFO \x1b[0m Test Message" + "dummypath 10 \x1b[32mINFO \x1b[0m Test Message" ) tw.hasmarkup = False formatter = ColoredLevelFormatter(tw, logfmt) output = formatter.format(record) - assert output == ("dummypath 10 " "INFO Test Message") + assert output == ("dummypath 10 INFO Test Message") diff --git a/testing/test_junitxml.py b/testing/test_junitxml.py index 2304c4a50..29d3f7f6e 100644 --- a/testing/test_junitxml.py +++ b/testing/test_junitxml.py @@ -476,7 +476,7 @@ class TestPython(object): tnode.assert_attr( file="test_junit_prefixing.py", line="3", - classname="xyz.test_junit_prefixing." "TestHello", + classname="xyz.test_junit_prefixing.TestHello", name="test_hello", ) diff --git a/testing/test_pdb.py b/testing/test_pdb.py index 246f514b4..1c99c9f1e 100644 --- a/testing/test_pdb.py +++ b/testing/test_pdb.py @@ -282,7 +282,7 @@ class TestPDB(object): """ ) child = testdir.spawn_pytest( - "--show-capture=all --pdb " "-p no:logging %s" % p1 + "--show-capture=all --pdb -p no:logging %s" % p1 ) child.expect("get rekt") output = child.before.decode("utf8")