👹 Feed the hobgoblins (delint).

Author: jaraco

src/pip/_internal/cli/progress_bars.py

@@ -234,16 +234,6 @@ class DownloadBlueEmojiProgressBar(BaseDownloadProgressBar,  # type: ignore
     pass
 
 
-class ObjectMapAdapter:
-    """Translate getitem to getattr."""
-
-    def __init__(self, obj):
-        self.obj = obj
-
-    def __getitem__(self, key):
-        return getattr(self.obj, key)
-
-
 class DownloadProgressSpinner(WindowsMixin, InterruptibleMixin,
                               DownloadProgressMixin, Spinner):
 
@@ -257,9 +247,15 @@ def next_phase(self):  # type: ignore
 
     def update(self):
         # type: () -> None
-        message = self.message.format_map(ObjectMapAdapter(self))
+        vals = dict(
+            downloaded=self.downloaded,
+            download_speed=self.download_speed,
+            pretty_eta=self.pretty_eta,
+            percent=self.percent,
+        )
+        message = self.message.format(**vals)
         phase = self.next_phase()
-        suffix = self.suffix.format_map(ObjectMapAdapter(self))
+        suffix = self.suffix.format(**vals)
         line = " ".join(filter(None, (message, phase, suffix)))
         self.writeln(line)
 

src/pip/_internal/cli/req_command.py

@@ -344,7 +344,7 @@ def get_requirements(
                 raise CommandError(
                     'You must give at least one requirement to {name} '
                     '(maybe you meant "pip {name} {links}"?)'.format(
-                    **dict(opts, links=' '.join(options.find_links))))
+                        **dict(opts, links=' '.join(options.find_links))))
             else:
                 raise CommandError(
                     'You must give at least one requirement to {name} '

src/pip/_internal/cli/spinners.py

@@ -106,7 +106,8 @@ def finish(self, final_status):
         # type: (str) -> None
         if self._finished:
             return
-        self._update("finished with status '{final_status}'".format(**locals()))
+        self._update(
+            "finished with status '{final_status}'".format(**locals()))
         self._finished = True
 
 

src/pip/_internal/commands/completion.py

@@ -85,7 +85,8 @@ def run(self, options, args):
         shell_options = ['--' + shell for shell in sorted(shells)]
         if options.shell in shells:
             script = textwrap.dedent(
-                COMPLETION_SCRIPTS.get(options.shell, '').format(prog=get_prog())
+                COMPLETION_SCRIPTS.get(options.shell, '').format(
+                    prog=get_prog())
             )
             print(BASE_COMPLETION.format(script=script, shell=options.shell))
         else:

src/pip/_internal/models/link.py

@@ -96,7 +96,8 @@ def filename(self):
             return netloc
 
         name = urllib_parse.unquote(name)
-        assert name, ('URL {self._url!r} produced no filename'.format(**locals()))
+        assert name, (
+            'URL {self._url!r} produced no filename'.format(**locals()))
         return name
 
     @property

src/pip/_internal/req/req_install.py

@@ -639,7 +639,8 @@ def update_editable(self, obtain=True):
         if self.link.scheme == 'file':
             # Static paths don't get updated
             return
-        assert '+' in self.link.url, "bad url: {self.link.url!r}".format(**locals())
+        assert '+' in self.link.url, \
+            "bad url: {self.link.url!r}".format(**locals())
         vc_type, url = self.link.url.split('+', 1)
         vcs_backend = vcs.get_backend(vc_type)
         if vcs_backend:

src/pip/_internal/utils/filesystem.py

@@ -73,7 +73,8 @@ def copy2_fixed(src, dest):
                 pass
             else:
                 if is_socket_file:
-                    raise shutil.SpecialFileError("`{f}` is a socket".format(**locals()))
+                    raise shutil.SpecialFileError(
+                        "`{f}` is a socket".format(**locals()))
 
         raise
 

src/pip/_internal/utils/urls.py

@@ -34,7 +34,8 @@ def url_to_path(url):
     Convert a file: URL to a path.
     """
     assert url.startswith('file:'), (
-        "You can only turn file: urls into filenames (not {url!r})".format(**locals()))
+        "You can only turn file: urls into filenames (not {url!r})"
+        .format(**locals()))
 
     _, netloc, path, _, _ = urllib_parse.urlsplit(url)
 

src/pip/_internal/vcs/subversion.py

@@ -151,7 +151,8 @@ def _get_svn_url_rev(cls, location):
         elif data.startswith('<?xml'):
             match = _svn_xml_url_re.search(data)
             if not match:
-                raise ValueError('Badly formatted data: {data!r}'.format(**locals()))
+                raise ValueError(
+                    'Badly formatted data: {data!r}'.format(**locals()))
             url = match.group(1)    # get repository URL
             revs = [int(m.group(1)) for m in _svn_rev_re.finditer(data)] + [0]
         else:

tests/conftest.py

@@ -234,11 +234,13 @@ def not_code_files_and_folders(path, names):
 
 
 def _common_wheel_editable_install(tmpdir_factory, common_wheels, package):
-    wheel_candidates = list(common_wheels.glob('{package}-*.whl'.format(**locals())))
+    wheel_candidates = list(
+        common_wheels.glob('{package}-*.whl'.format(**locals())))
     assert len(wheel_candidates) == 1, wheel_candidates
     install_dir = Path(str(tmpdir_factory.mktemp(package))) / 'install'
     Wheel(wheel_candidates[0]).install_as_egg(install_dir)
-    (install_dir / 'EGG-INFO').rename(install_dir / '{package}.egg-info'.format(**locals()))
+    (install_dir / 'EGG-INFO').rename(
+        install_dir / '{package}.egg-info'.format(**locals()))
     assert compileall.compile_dir(str(install_dir), quiet=1)
     return install_dir