diff options
author | Jon Dufresne <jon.dufresne@gmail.com> | 2021-08-08 13:38:07 -0700 |
---|---|---|
committer | Jon Dufresne <jon.dufresne@gmail.com> | 2021-08-09 20:05:32 -0700 |
commit | 61333f573257fcd84151c657b4f3272086ff4c1f (patch) | |
tree | d9b5f5a221254e47f8b6b2e1ed4f3d0f61325e40 /src/pip/_internal/operations/prepare.py | |
parent | 618f7e7528705af252ef666fe5d35fd9e8091c13 (diff) | |
download | pip-61333f573257fcd84151c657b4f3272086ff4c1f.tar.gz |
Simplify RequirementPreparer._downloaded data structure
The original type was `Dict[str, Tuple[str, str]]`. The 2nd element of
the tuple goes unused so map to a single str instead.
Diffstat (limited to 'src/pip/_internal/operations/prepare.py')
-rw-r--r-- | src/pip/_internal/operations/prepare.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/pip/_internal/operations/prepare.py b/src/pip/_internal/operations/prepare.py index c5e4f508c..2b838a019 100644 --- a/src/pip/_internal/operations/prepare.py +++ b/src/pip/_internal/operations/prepare.py @@ -8,7 +8,7 @@ import logging import mimetypes import os import shutil -from typing import Dict, Iterable, List, Optional, Tuple +from typing import Dict, Iterable, List, Optional from pip._vendor.packaging.utils import canonicalize_name from pip._vendor.pkg_resources import Distribution @@ -319,8 +319,8 @@ class RequirementPreparer: # Should in-tree builds be used for local paths? self.in_tree_build = in_tree_build - # Memoized downloaded files, as mapping of url: (path, mime type) - self._downloaded: Dict[str, Tuple[str, str]] = {} + # Memoized downloaded files, as mapping of url: path. + self._downloaded: Dict[str, str] = {} # Previous "header" printed for a link-based InstallRequirement self._previous_requirement_header = ("", "") @@ -487,7 +487,7 @@ class RequirementPreparer: if file_path is not None: # The file is already available, so mark it as downloaded - self._downloaded[req.link.url] = file_path, None + self._downloaded[req.link.url] = file_path else: # The file is not available, attempt to fetch only metadata wheel_dist = self._fetch_metadata_using_lazy_wheel(link) @@ -509,7 +509,7 @@ class RequirementPreparer: hashes = self._get_linked_req_hashes(req) file_path = _check_download_dir(req.link, self.download_dir, hashes) if file_path is not None: - self._downloaded[req.link.url] = file_path, None + self._downloaded[req.link.url] = file_path req.needs_more_preparation = False # Prepare requirements we found were already downloaded for some @@ -550,10 +550,10 @@ class RequirementPreparer: 'error {} for URL {}'.format(req, exc, link) ) else: - file_path, content_type = self._downloaded[link.url] + file_path = self._downloaded[link.url] if hashes: hashes.check_against_path(file_path) - local_file = File(file_path, content_type) + local_file = File(file_path, content_type=None) # For use in later processing, # preserve the file path on the requirement. |