Upgrade with pyupgrade --py38-plus

Author: hugovk

src/pip/_internal/network/auth.py

@@ -151,7 +151,7 @@ def _set_password(self, service_name: str, username: str, password: str) -> None
         env["PYTHONIOENCODING"] = "utf-8"
         subprocess.run(
             [self.keyring, "set", service_name, username],
-            input=f"{password}{os.linesep}".encode("utf-8"),
+            input=f"{password}{os.linesep}".encode(),
             env=env,
             check=True,
         )

src/pip/_internal/network/session.py

@@ -230,7 +230,7 @@ def send(
             # to return a better error message:
             resp.status_code = 404
             resp.reason = type(exc).__name__
-            resp.raw = io.BytesIO(f"{resp.reason}: {exc}".encode("utf8"))
+            resp.raw = io.BytesIO(f"{resp.reason}: {exc}".encode())
         else:
             modified = email.utils.formatdate(stats.st_mtime, usegmt=True)
             content_type = mimetypes.guess_type(pathname)[0] or "text/plain"

src/pip/_internal/operations/build/build_tracker.py

@@ -99,7 +99,7 @@ def add(self, req: InstallRequirement, key: TrackerId) -> None:
         except FileNotFoundError:
             pass
         else:
-            message = "{} is already being built: {}".format(req.link, contents)
+            message = f"{req.link} is already being built: {contents}"
             raise LookupError(message)
 
         # If we're here, req should really not be building already.

src/pip/_internal/operations/build/metadata_legacy.py

@@ -27,7 +27,7 @@ def _find_egg_info(directory: str) -> str:
 
     if len(filenames) > 1:
         raise InstallationError(
-            "More than one .egg-info directory found in {}".format(directory)
+            f"More than one .egg-info directory found in {directory}"
         )
 
     return os.path.join(directory, filenames[0])

src/pip/_internal/req/req_uninstall.py

@@ -315,7 +315,7 @@ def __init__(self, dist: BaseDistribution) -> None:
         # Create local cache of normalize_path results. Creating an UninstallPathSet
         # can result in hundreds/thousands of redundant calls to normalize_path with
         # the same args, which hurts performance.
-        self._normalize_path_cached = functools.lru_cache()(normalize_path)
+        self._normalize_path_cached = functools.lru_cache(normalize_path)
 
     def _permitted(self, path: str) -> bool:
         """

tests/data/packages/BrokenEmitsUTF8/setup.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import sys
 from distutils.core import setup
 
@@ -10,14 +8,10 @@ class FakeError(Exception):
 
 if sys.argv[1] in ("install", "bdist_wheel"):
     if hasattr(sys.stdout, "buffer"):
+        sys.stdout.buffer.write(b"\nThis package prints out UTF-8 stuff like:\n")
+        sys.stdout.buffer.write("* return type of ‘main’ is not ‘int’\n".encode())
         sys.stdout.buffer.write(
-            "\nThis package prints out UTF-8 stuff like:\n".encode("utf-8")
-        )
-        sys.stdout.buffer.write(
-            "* return type of ‘main’ is not ‘int’\n".encode("utf-8")
-        )
-        sys.stdout.buffer.write(
-            "* Björk Guðmundsdóttir [ˈpjœr̥k ˈkvʏðmʏntsˌtoʊhtɪr]".encode("utf-8")
+            "* Björk Guðmundsdóttir [ˈpjœr̥k ˈkvʏðmʏntsˌtoʊhtɪr]".encode()
         )
     else:
         pass

tests/functional/test_cache.py

@@ -114,10 +114,8 @@ def list_matches_wheel_abspath(wheel_name: str, result: TestPipResult) -> bool:
     lines = result.stdout.splitlines()
     expected = f"{wheel_name}-py3-none-any.whl"
     return any(
-        (
-            (os.path.basename(line).startswith(expected) and os.path.exists(line))
-            for line in lines
-        )
+        (os.path.basename(line).startswith(expected) and os.path.exists(line))
+        for line in lines
     )