From 93f40ace776ccd97bad0c2cccb0310482fcf1990 Mon Sep 17 00:00:00 2001 From: Oz Tiram Date: Tue, 1 Nov 2022 00:21:51 +0100 Subject: [PATCH] Vendor: more disltlib import fixes --- pipenv/vendor/requirementslib/models/metadata.py | 4 ++-- tasks/vendoring/__init__.py | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pipenv/vendor/requirementslib/models/metadata.py b/pipenv/vendor/requirementslib/models/metadata.py index de33d128..4ea7969c 100644 --- a/pipenv/vendor/requirementslib/models/metadata.py +++ b/pipenv/vendor/requirementslib/models/metadata.py @@ -13,8 +13,8 @@ from typing import Sequence import pipenv.vendor.attr as attr import pipenv.patched.pip._vendor.requests as requests import pipenv.vendor.vistir as vistir -from pipenv.vendor.distlib import wheel -from pipenv.vendor.distlib.metadata import Metadata +from pipenv.patched.pip._vendor.distlib import wheel +from pipenv.patched.pip._vendor.distlib.metadata import import Metadata from pipenv.patched.pip._vendor.packaging.markers import Marker from pipenv.patched.pip._vendor.packaging.requirements import Requirement as PackagingRequirement from pipenv.patched.pip._vendor.packaging.specifiers import Specifier, SpecifierSet diff --git a/tasks/vendoring/__init__.py b/tasks/vendoring/__init__.py index 41b5a25c..bfc5027d 100644 --- a/tasks/vendoring/__init__.py +++ b/tasks/vendoring/__init__.py @@ -87,15 +87,20 @@ GLOBAL_REPLACEMENT = [ "from platformdirs import user_cache_dir", "from pipenv.patched.pip._vendor.platformdirs import user_cache_dir", ), - ( + ( "from distlib import", "from pipenv.patched.pip._vendor.distlib import" ), - ( + ( "from distlib.metadata", "from pipenv.patched.pip._vendor.distlib.metadata import" ), - ( "import colorama", + ( + "from distlib.wheel import", + "from pipenv.patched.pip._vendor.distlib.wheel import" + ), + ( + "import colorama", "from pipenv.patched.pip._vendor import colorama" )