McSinyx
/
pip
mirror of https://github.com/pypa/pip
1
1
Fork 0
Code Issues Releases Activity

Move common processing out of _fetch_metadata 

Returning a `Distribution` makes `_fetch_metadata` look more like
`_prepare_distribution`, in preparation for moving it there next.
This commit is contained in:
Chris Hunt 2020-08-02 11:35:47 -04:00
parent 8c3c0ade78
commit a72d04f734
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pip/_internal/resolution/resolvelib/candidates.py
View File

@ -218,8 +218,10 @@ class _InstallRequirementBackedCandidate(Candidate):
# type: () -> None
if self._dist is not None:
return
self._fetch_metadata()
if self._dist is not None:
dist = self._fetch_metadata()
if dist is not None:
self._check_metadata_consistency(dist)
self._dist = dist
return
try:
dist = self._prepare_distribution()
@ -232,7 +234,7 @@ class _InstallRequirementBackedCandidate(Candidate):
self._dist = dist
def _fetch_metadata(self):
# type: () -> None
# type: () -> Optional[Distribution]
"""Fetch metadata, using lazy wheel if possible."""
preparer = self._factory.preparer
use_lazy_wheel = self._factory.use_lazy_wheel
@ -248,9 +250,8 @@ class _InstallRequirementBackedCandidate(Candidate):
)
url = self._link.url.split('#', 1)[0]
session = preparer.downloader._session
dist = dist_from_wheel_url(self._name, url, session)
self._check_metadata_consistency(dist)
self._dist = dist
return dist_from_wheel_url(self._name, url, session)
return None
@property
def dist(self):