diff options
| author | robot-piglet <[email protected]> | 2025-03-13 11:56:32 +0300 |
|---|---|---|
| committer | robot-piglet <[email protected]> | 2025-03-13 12:08:23 +0300 |
| commit | bf5902122bc8010f49d17f25c91adc2a24a3e2d7 (patch) | |
| tree | 99c1e3424755d13b789d81cf0283fca57c76b679 /contrib/python | |
| parent | c4640cab0e3a1d110e77a74f462000225ee6cc30 (diff) | |
Intermediate changes
commit_hash:3fcc741adc969ad27c0f83a0f033fc5b0e941cad
Diffstat (limited to 'contrib/python')
| -rw-r--r-- | contrib/python/setuptools/py3/.dist-info/METADATA | 2 | ||||
| -rw-r--r-- | contrib/python/setuptools/py3/pkg_resources/__init__.py | 17 | ||||
| -rw-r--r-- | contrib/python/setuptools/py3/ya.make | 2 |
3 files changed, 13 insertions, 8 deletions
diff --git a/contrib/python/setuptools/py3/.dist-info/METADATA b/contrib/python/setuptools/py3/.dist-info/METADATA index b947a7318fe..2b81ee9bd49 100644 --- a/contrib/python/setuptools/py3/.dist-info/METADATA +++ b/contrib/python/setuptools/py3/.dist-info/METADATA @@ -1,6 +1,6 @@ Metadata-Version: 2.2 Name: setuptools -Version: 75.8.1 +Version: 75.8.2 Summary: Easily download, build, install, upgrade, and uninstall Python packages Author-email: Python Packaging Authority <[email protected]> Project-URL: Source, https://github.com/pypa/setuptools diff --git a/contrib/python/setuptools/py3/pkg_resources/__init__.py b/contrib/python/setuptools/py3/pkg_resources/__init__.py index df522e5b86a..b25c6c1f656 100644 --- a/contrib/python/setuptools/py3/pkg_resources/__init__.py +++ b/contrib/python/setuptools/py3/pkg_resources/__init__.py @@ -708,14 +708,19 @@ class WorkingSet: If there is no active distribution for the requested project, ``None`` is returned. """ - dist = self.by_key.get(req.key) + dist: Distribution | None = None - if dist is None: - canonical_key = self.normalized_to_canonical_keys.get(req.key) + candidates = ( + req.key, + self.normalized_to_canonical_keys.get(req.key), + safe_name(req.key).replace(".", "-"), + ) - if canonical_key is not None: - req.key = canonical_key - dist = self.by_key.get(canonical_key) + for candidate in filter(None, candidates): + dist = self.by_key.get(candidate) + if dist: + req.key = candidate + break if dist is not None and dist not in req: # XXX add more info diff --git a/contrib/python/setuptools/py3/ya.make b/contrib/python/setuptools/py3/ya.make index 24de6a7a6d7..d28ff13d742 100644 --- a/contrib/python/setuptools/py3/ya.make +++ b/contrib/python/setuptools/py3/ya.make @@ -2,7 +2,7 @@ PY3_LIBRARY() -VERSION(75.8.1) +VERSION(75.8.2) LICENSE(MIT) |