Fix #4093: multiple string literals on a line

This commit is contained in:
Niklas JQ
2018-10-10 19:28:31 +02:00
parent 4b164d947d
commit c14a23d4e4
15 changed files with 18 additions and 18 deletions

View File

@@ -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:]

View File

@@ -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():

View File

@@ -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

View File

@@ -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)
)
)

View File

@@ -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(

View File

@@ -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()

View File

@@ -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(

View File

@@ -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):

View File

@@ -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():