Cleanup implicit string concatenation

pradyunsg · pradyunsg · commit 585037a80a11 · 2021-08-20T13:37:52.000+01:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -28,6 +28,7 @@ repos:
     additional_dependencies: [
         'flake8-bugbear==20.1.4',
         'flake8-logging-format==0.6.0',
+        'flake8-implicit-str-concat==0.2.0',
     ]
     exclude: tests/data
 
diff --git a/src/pip/_internal/index/package_finder.py b/src/pip/_internal/index/package_finder.py
@@ -86,7 +86,7 @@ def _check_link_requires_python(
                 return False
 
             logger.debug(
-                "Ignoring failed Requires-Python check (%s not in: %r) " "for link: %s",
+                "Ignoring failed Requires-Python check (%s not in: %r) for link: %s",
                 version,
                 link.requires_python,
                 link,
@@ -935,7 +935,7 @@ def _format_versions(cand_iter: Iterable[InstallationCandidate]) -> str:
         if best_installed:
             # We have an existing version, and its the best version
             logger.debug(
-                "Installed version (%s) is most up-to-date (past versions: " "%s)",
+                "Installed version (%s) is most up-to-date (past versions: %s)",
                 installed_version,
                 _format_versions(best_candidate_result.iter_applicable()),
             )
diff --git a/src/pip/_internal/models/search_scope.py b/src/pip/_internal/models/search_scope.py
@@ -88,7 +88,7 @@ def get_formatted_locations(self) -> str:
                 # exceptions for malformed URLs
                 if not purl.scheme and not purl.netloc:
                     logger.warning(
-                        'The index url "%s" seems invalid, ' "please provide a scheme.",
+                        'The index url "%s" seems invalid, please provide a scheme.',
                         redacted_index_url,
                     )
 
diff --git a/src/pip/_internal/operations/freeze.py b/src/pip/_internal/operations/freeze.py
@@ -150,7 +150,7 @@ def freeze(
                     ", ".join(sorted(set(files))),
                 )
 
-        yield ("## The following requirements were added by " "pip freeze:")
+        yield ("## The following requirements were added by pip freeze:")
     for installation in sorted(installations.values(), key=lambda x: x.name.lower()):
         if installation.canonical_name not in skip:
             yield str(installation).rstrip()
diff --git a/src/pip/_internal/operations/prepare.py b/src/pip/_internal/operations/prepare.py
@@ -254,7 +254,7 @@ def _check_download_dir(
             hashes.check_against_path(download_path)
         except HashMismatch:
             logger.warning(
-                "Previously-downloaded file %s has bad hash. " "Re-downloading.",
+                "Previously-downloaded file %s has bad hash. Re-downloading.",
                 download_path,
             )
             os.unlink(download_path)
@@ -409,7 +409,7 @@ def _fetch_metadata_using_lazy_wheel(self, link: Link) -> Optional[Distribution]
             return None
         if link.is_file or not link.is_wheel:
             logger.debug(
-                "Lazy wheel is not used as " "%r does not points to a remote wheel",
+                "Lazy wheel is not used as %r does not points to a remote wheel",
                 link,
             )
             return None
diff --git a/src/pip/_internal/wheel_builder.py b/src/pip/_internal/wheel_builder.py
@@ -74,7 +74,7 @@ def _should_build(
 
     if not check_binary_allowed(req):
         logger.info(
-            "Skipping wheel build for %s, due to binaries " "being disabled for it.",
+            "Skipping wheel build for %s, due to binaries being disabled for it.",
             req.name,
         )
         return False
@@ -265,7 +265,7 @@ def _build_one_inside_env(
                 wheel_hash, length = hash_file(wheel_path)
                 shutil.move(wheel_path, dest_path)
                 logger.info(
-                    "Created wheel for %s: " "filename=%s size=%d sha256=%s",
+                    "Created wheel for %s: filename=%s size=%d sha256=%s",
                     req.name,
                     wheel_name,
                     length,
diff --git a/tests/functional/test_cache.py b/tests/functional/test_cache.py
@@ -10,7 +10,7 @@ def cache_dir(script):
     result = script.run(
         "python",
         "-c",
-        "from pip._internal.locations import USER_CACHE_DIR;" "print(USER_CACHE_DIR)",
+        "from pip._internal.locations import USER_CACHE_DIR;print(USER_CACHE_DIR)",
     )
     return result.stdout.strip()
 
diff --git a/tests/functional/test_completion.py b/tests/functional/test_completion.py
@@ -177,12 +177,12 @@ def test_completion_files_after_option(autocomplete, data):
         cword="3",
         cwd=data.completion_paths,
     )
-    assert "requirements.txt" in res.stdout, (
-        "autocomplete function could not complete <file> " "after options in command"
-    )
-    assert os.path.join("resources", "") in res.stdout, (
-        "autocomplete function could not complete <dir> " "after options in command"
-    )
+    assert (
+        "requirements.txt" in res.stdout
+    ), "autocomplete function could not complete <file> after options in command"
+    assert (
+        os.path.join("resources", "") in res.stdout
+    ), "autocomplete function could not complete <dir> after options in command"
     assert not any(
         out in res.stdout for out in (os.path.join("REPLAY", ""), "README.txt")
     ), (
@@ -191,12 +191,12 @@ def test_completion_files_after_option(autocomplete, data):
     )
     if sys.platform != "win32":
         return
-    assert "readme.txt" in res.stdout, (
-        "autocomplete function could not complete <file> " "after options in command"
-    )
-    assert os.path.join("replay", "") in res.stdout, (
-        "autocomplete function could not complete <dir> " "after options in command"
-    )
+    assert (
+        "readme.txt" in res.stdout
+    ), "autocomplete function could not complete <file> after options in command"
+    assert (
+        os.path.join("replay", "") in res.stdout
+    ), "autocomplete function could not complete <dir> after options in command"
 
 
 def test_completion_not_files_after_option(autocomplete, data):
@@ -209,12 +209,16 @@ def test_completion_not_files_after_option(autocomplete, data):
         cword="2",
         cwd=data.completion_paths,
     )
-    assert not any(out in res.stdout for out in ("requirements.txt", "readme.txt",)), (
-        "autocomplete function completed <file> when " "it should not complete"
-    )
+    assert not any(
+        out in res.stdout
+        for out in (
+            "requirements.txt",
+            "readme.txt",
+        )
+    ), "autocomplete function completed <file> when it should not complete"
     assert not any(
         os.path.join(out, "") in res.stdout for out in ("replay", "resources")
-    ), ("autocomplete function completed <dir> when " "it should not complete")
+    ), "autocomplete function completed <dir> when it should not complete"
 
 
 @pytest.mark.parametrize("cl_opts", ["-U", "--user", "-h"])
@@ -228,12 +232,16 @@ def test_completion_not_files_after_nonexpecting_option(autocomplete, data, cl_o
         cword="2",
         cwd=data.completion_paths,
     )
-    assert not any(out in res.stdout for out in ("requirements.txt", "readme.txt",)), (
-        "autocomplete function completed <file> when " "it should not complete"
-    )
+    assert not any(
+        out in res.stdout
+        for out in (
+            "requirements.txt",
+            "readme.txt",
+        )
+    ), "autocomplete function completed <file> when it should not complete"
     assert not any(
         os.path.join(out, "") in res.stdout for out in ("replay", "resources")
-    ), ("autocomplete function completed <dir> when " "it should not complete")
+    ), "autocomplete function completed <dir> when it should not complete"
 
 
 def test_completion_directories_after_option(autocomplete, data):
@@ -252,7 +260,7 @@ def test_completion_directories_after_option(autocomplete, data):
     assert not any(
         out in res.stdout
         for out in ("requirements.txt", "README.txt", os.path.join("REPLAY", ""))
-    ), ("autocomplete function completed <dir> when " "it should not complete")
+    ), "autocomplete function completed <dir> when it should not complete"
     if sys.platform == "win32":
         assert (
             os.path.join("replay", "") in res.stdout
diff --git a/tests/functional/test_freeze.py b/tests/functional/test_freeze.py
@@ -834,7 +834,7 @@ def test_freeze_with_requirement_option_package_repeated_multi_file(script):
         "Requirement file [hint2.txt] contains NoExist, but package "
         "'NoExist' is not installed\n"
     )
-    err2 = "Requirement simple included multiple times " "[hint1.txt, hint2.txt]\n"
+    err2 = "Requirement simple included multiple times [hint1.txt, hint2.txt]\n"
     assert err1 in result.stderr
     assert err2 in result.stderr
     # there shouldn't be any other 'is not installed' warnings
diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
@@ -1615,9 +1615,7 @@ def test_double_install_fail(script, resolver_variant):
         expect_error=(resolver_variant == "legacy"),
     )
     if resolver_variant == "legacy":
-        msg = (
-            "Double requirement given: pip==7.1.2 (already in pip==7.*, " "name='pip')"
-        )
+        msg = "Double requirement given: pip==7.1.2 (already in pip==7.*, name='pip')"
         assert msg in result.stderr
 
 
@@ -1939,7 +1937,7 @@ def test_invalid_index_url_argument(script, shared_data):
     )
 
     assert (
-        'WARNING: The index url "--user" seems invalid, ' "please provide a scheme."
+        'WARNING: The index url "--user" seems invalid, please provide a scheme.'
     ) in result.stderr, str(result)
 
 
diff --git a/tests/functional/test_install_reqs.py b/tests/functional/test_install_reqs.py
@@ -654,7 +654,7 @@ def test_install_distribution_union_with_versions(
         assert ("localextras[baz] 0.0.2 depends on localextras 0.0.2") in result.stdout
     else:
         assert (
-            "Successfully installed LocalExtras-0.0.1 simple-3.0 " "singlemodule-0.0.1"
+            "Successfully installed LocalExtras-0.0.1 simple-3.0 singlemodule-0.0.1"
         ) in result.stdout
 
 
@@ -705,8 +705,7 @@ def test_install_unsupported_wheel_file(script, data):
         expect_stderr=True,
     )
     assert (
-        "simple.dist-0.1-py1-none-invalid.whl is not a supported "
-        + "wheel on this platform"
+        "simple.dist-0.1-py1-none-invalid.whl is not a supported wheel on this platform"
         in result.stderr
     )
     assert len(result.files_created) == 0
diff --git a/tests/functional/test_list.py b/tests/functional/test_list.py
@@ -234,7 +234,7 @@ def test_outdated_flag(script, data):
     script.pip(
         "install",
         "-e",
-        "git+https://github.com/pypa/pip-test-package.git" "@0.1#egg=pip-test-package",
+        "git+https://github.com/pypa/pip-test-package.git@0.1#egg=pip-test-package",
     )
     result = script.pip(
         "list",
@@ -283,7 +283,7 @@ def test_outdated_columns_flag(script, data):
     script.pip(
         "install",
         "-e",
-        "git+https://github.com/pypa/pip-test-package.git" "@0.1#egg=pip-test-package",
+        "git+https://github.com/pypa/pip-test-package.git@0.1#egg=pip-test-package",
     )
     result = script.pip(
         "list",
@@ -397,7 +397,7 @@ def test_outdated_editables_flag(script, data):
     result = script.pip(
         "install",
         "-e",
-        "git+https://github.com/pypa/pip-test-package.git" "@0.1#egg=pip-test-package",
+        "git+https://github.com/pypa/pip-test-package.git@0.1#egg=pip-test-package",
     )
     result = script.pip(
         "list",
@@ -420,7 +420,7 @@ def test_outdated_editables_columns_flag(script, data):
     result = script.pip(
         "install",
         "-e",
-        "git+https://github.com/pypa/pip-test-package.git" "@0.1#egg=pip-test-package",
+        "git+https://github.com/pypa/pip-test-package.git@0.1#egg=pip-test-package",
     )
     result = script.pip(
         "list",
diff --git a/tests/functional/test_requests.py b/tests/functional/test_requests.py
@@ -15,4 +15,4 @@ def test_timeout(script):
         "Could not fetch URL https://pypi.org/simple/INITools/: "
         "timed out" in result.stdout
     )
-    assert "Could not fetch URL https://pypi.org/simple/: " "timed out" in result.stdout
+    assert "Could not fetch URL https://pypi.org/simple/: timed out" in result.stdout
diff --git a/tests/functional/test_uninstall.py b/tests/functional/test_uninstall.py
@@ -537,7 +537,7 @@ def test_uninstall_without_record_fails(script, data, installer):
 
     result2 = script.pip("uninstall", "simple.dist", "-y", expect_error=True)
     expected_error_message = (
-        "ERROR: Cannot uninstall simple.dist 0.1, " "RECORD file not found."
+        "ERROR: Cannot uninstall simple.dist 0.1, RECORD file not found."
     )
     if not isinstance(installer, str) or not installer.strip() or installer == "pip":
         expected_error_message += (
@@ -546,7 +546,7 @@ def test_uninstall_without_record_fails(script, data, installer):
             "simple.dist==0.1'."
         )
     elif installer:
-        expected_error_message += " Hint: The package was installed by " "{}.".format(
+        expected_error_message += " Hint: The package was installed by {}.".format(
             installer
         )
     assert result2.stderr.rstrip() == expected_error_message
diff --git a/tests/unit/test_collector.py b/tests/unit/test_collector.py
@@ -231,7 +231,7 @@ def test_get_html_response_dont_log_clear_text_password(mock_raise_for_status, c
     [
         (b"<html></html>", "https://example.com/", "https://example.com/"),
         (
-            b"<html><head>" b'<base href="https://foo.example.com/">' b"</head></html>",
+            b'<html><head><base href="https://foo.example.com/"></head></html>',
             "https://example.com/",
             "https://foo.example.com/",
         ),
diff --git a/tests/unit/test_command_install.py b/tests/unit/test_command_install.py
@@ -89,7 +89,7 @@ def test_rejection_for_location_requirement_options():
             OSError("Illegal byte sequence"),
             True,
             True,
-            "Could not install" " packages due to an OSError.\n",
+            "Could not install packages due to an OSError.\n",
         ),
         (
             OSError(errno.EACCES, "No file permission"),
@@ -104,7 +104,7 @@ def test_rejection_for_location_requirement_options():
             OSError("Illegal byte sequence"),
             True,
             False,
-            "Could not" " install packages due to an OSError.\n",
+            "Could not install packages due to an OSError.\n",
         ),
         (
             OSError(errno.EACCES, "No file permission"),
diff --git a/tests/unit/test_direct_url_helpers.py b/tests/unit/test_direct_url_helpers.py
@@ -135,7 +135,7 @@ def test_from_link_archive():
     assert direct_url.url == "https://g.c/archive.tgz"
     assert isinstance(direct_url.info, ArchiveInfo)
     direct_url = direct_url_from_link(
-        Link("https://g.c/archive.tgz" "#sha1=1b8c5bc61a86f377fea47b4276c8c8a5842d2220")
+        Link("https://g.c/archive.tgz#sha1=1b8c5bc61a86f377fea47b4276c8c8a5842d2220")
     )
     assert isinstance(direct_url.info, ArchiveInfo)
     assert direct_url.info.hash == "sha1=1b8c5bc61a86f377fea47b4276c8c8a5842d2220"
diff --git a/tests/unit/test_index.py b/tests/unit/test_index.py
@@ -103,7 +103,7 @@ def test_check_link_requires_python__invalid_requires(caplog):
     assert actual
 
     expected_message = (
-        "Ignoring invalid Requires-Python ('invalid') for link: " "https://example.com"
+        "Ignoring invalid Requires-Python ('invalid') for link: https://example.com"
     )
     check_caplog(caplog, "DEBUG", expected_message)
 
diff --git a/tests/unit/test_logging.py b/tests/unit/test_logging.py
@@ -53,7 +53,7 @@ def test_format(self, level_name, expected, utc):
     @pytest.mark.parametrize(
         "level_name, expected",
         [
-            ("INFO", "2019-01-17T06:00:37,040 hello\n" "2019-01-17T06:00:37,040 world"),
+            ("INFO", "2019-01-17T06:00:37,040 hello\n2019-01-17T06:00:37,040 world"),
             (
                 "WARNING",
                 "2019-01-17T06:00:37,040 WARNING: hello\n"
diff --git a/tests/unit/test_req_file.py b/tests/unit/test_req_file.py
@@ -345,8 +345,8 @@ def test_hash_options(self, line_processor):
         req = line_processor(line, filename, 1)[0]
         assert req.hash_options == {
             "sha256": [
-                "2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e730433" "62938b9824",
-                "486ea46224d1bb4fb680f34f7c9ad96a8f24ec88be73ea8e5a6c65" "260e9cb8a7",
+                "2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824",
+                "486ea46224d1bb4fb680f34f7c9ad96a8f24ec88be73ea8e5a6c65260e9cb8a7",
             ],
             "sha384": [
                 "59e1748777448c69de6b800d7a33bbfb9ff1b463e44354c3553bcd"
@@ -596,7 +596,7 @@ def test_multiple_appending_options(self, tmpdir, finder, options):
         assert finder.index_urls == ["url1", "url2"]
 
     def test_expand_existing_env_variables(self, tmpdir, finder):
-        template = "https://{}:x-oauth-basic@github.com/" "user/{}/archive/master.zip"
+        template = "https://{}:x-oauth-basic@github.com/user/{}/archive/master.zip"
 
         def make_var(name):
             return f"${{{name}}}"
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
@@ -423,11 +423,11 @@ def test_rmtree_retries_for_3sec(tmpdir, monkeypatch):
 
 if sys.byteorder == "little":
     expected_byte_string = (
-        "b'\\xff\\xfe/\\x00p\\x00a\\x00t\\x00h\\x00/" "\\x00d\\x00\\xe9\\x00f\\x00'"
+        "b'\\xff\\xfe/\\x00p\\x00a\\x00t\\x00h\\x00/\\x00d\\x00\\xe9\\x00f\\x00'"
     )
 elif sys.byteorder == "big":
     expected_byte_string = (
-        "b'\\xfe\\xff\\x00/\\x00p\\x00a\\x00t\\x00h\\" "x00/\\x00d\\x00\\xe9\\x00f'"
+        "b'\\xfe\\xff\\x00/\\x00p\\x00a\\x00t\\x00h\\x00/\\x00d\\x00\\xe9\\x00f'"
     )
 
 
diff --git a/tests/unit/test_utils_subprocess.py b/tests/unit/test_utils_subprocess.py
@@ -152,7 +152,7 @@ def test_call_subprocess_stdout_only(capfd, monkeypatch, stdout_only, expected):
         [
             sys.executable,
             "-c",
-            "import sys; " "sys.stdout.write('out\\n'); " "sys.stderr.write('err\\n')",
+            "import sys; sys.stdout.write('out\\n'); sys.stderr.write('err\\n')",
         ],
         stdout_only=stdout_only,
     )

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ repos:`
`28`	`28`	`additional_dependencies: [`
`29`	`29`	`'flake8-bugbear==20.1.4',`
`30`	`30`	`'flake8-logging-format==0.6.0',`
	`31`	`+ 'flake8-implicit-str-concat==0.2.0',`
`31`	`32`	`]`
`32`	`33`	`exclude: tests/data`
`33`	`34`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ def get_formatted_locations(self) -> str:`
`88`	`88`	`# exceptions for malformed URLs`
`89`	`89`	`if not purl.scheme and not purl.netloc:`
`90`	`90`	`logger.warning(`
`91`		`- 'The index url "%s" seems invalid, ' "please provide a scheme.",`
	`91`	`+ 'The index url "%s" seems invalid, please provide a scheme.',`
`92`	`92`	`redacted_index_url,`
`93`	`93`	`)`
`94`	`94`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ def freeze(`
`150`	`150`	`", ".join(sorted(set(files))),`
`151`	`151`	`)`
`152`	`152`
`153`		`- yield ("## The following requirements were added by " "pip freeze:")`
	`153`	`+ yield ("## The following requirements were added by pip freeze:")`
`154`	`154`	`for installation in sorted(installations.values(), key=lambda x: x.name.lower()):`
`155`	`155`	`if installation.canonical_name not in skip:`
`156`	`156`	`yield str(installation).rstrip()`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ def cache_dir(script):`
`10`	`10`	`result = script.run(`
`11`	`11`	`"python",`
`12`	`12`	`"-c",`
`13`		`- "from pip._internal.locations import USER_CACHE_DIR;" "print(USER_CACHE_DIR)",`
	`13`	`+ "from pip._internal.locations import USER_CACHE_DIR;print(USER_CACHE_DIR)",`
`14`	`14`	`)`
`15`	`15`	`return result.stdout.strip()`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -834,7 +834,7 @@ def test_freeze_with_requirement_option_package_repeated_multi_file(script):`
`834`	`834`	`"Requirement file [hint2.txt] contains NoExist, but package "`
`835`	`835`	`"'NoExist' is not installed\n"`
`836`	`836`	`)`
`837`		`- err2 = "Requirement simple included multiple times " "[hint1.txt, hint2.txt]\n"`
	`837`	`+ err2 = "Requirement simple included multiple times [hint1.txt, hint2.txt]\n"`
`838`	`838`	`assert err1 in result.stderr`
`839`	`839`	`assert err2 in result.stderr`
`840`	`840`	`# there shouldn't be any other 'is not installed' warnings`
Original file line number	Diff line number	Diff line change
`@@ -1615,9 +1615,7 @@ def test_double_install_fail(script, resolver_variant):`
`1615`	`1615`	`expect_error=(resolver_variant == "legacy"),`
`1616`	`1616`	`)`
`1617`	`1617`	`if resolver_variant == "legacy":`
`1618`		`- msg = (`
`1619`		`- "Double requirement given: pip==7.1.2 (already in pip==7.*, " "name='pip')"`
`1620`		`- )`
	`1618`	`+ msg = "Double requirement given: pip==7.1.2 (already in pip==7.*, name='pip')"`
`1621`	`1619`	`assert msg in result.stderr`
`1622`	`1620`
`1623`	`1621`
`@@ -1939,7 +1937,7 @@ def test_invalid_index_url_argument(script, shared_data):`
`1939`	`1937`	`)`
`1940`	`1938`
`1941`	`1939`	`assert (`
`1942`		`- 'WARNING: The index url "--user" seems invalid, ' "please provide a scheme."`
	`1940`	`+ 'WARNING: The index url "--user" seems invalid, please provide a scheme.'`
`1943`	`1941`	`) in result.stderr, str(result)`
`1944`	`1942`
`1945`	`1943`