diff options
| author | Pradyun Gedam <pradyunsg@users.noreply.github.com> | 2023-02-04 21:18:10 +0000 |
|---|---|---|
| committer | Pradyun Gedam <pradyunsg@users.noreply.github.com> | 2023-02-04 21:18:10 +0000 |
| commit | eb7b4ed62e75cac1dfcb39b8e835baf6b1a1bb03 (patch) | |
| tree | 379005711ef2dc597f59b29efe481d2c9ca76e18 /tools | |
| parent | e3e7bc34eb486622ebbb6412afc98ee57fcbff4a (diff) | |
| download | pip-eb7b4ed62e75cac1dfcb39b8e835baf6b1a1bb03.tar.gz | |
Update vendored `pkg_resources`
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/vendoring/patches/pkg_resources.patch | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/tools/vendoring/patches/pkg_resources.patch b/tools/vendoring/patches/pkg_resources.patch index 6556a8608..39bb2eac2 100644 --- a/tools/vendoring/patches/pkg_resources.patch +++ b/tools/vendoring/patches/pkg_resources.patch @@ -1,22 +1,35 @@ diff --git a/src/pip/_vendor/pkg_resources/__init__.py b/src/pip/_vendor/pkg_resources/__init__.py -index a457ff27e..4cd562cf9 100644 +index d59226af9..3b9565893 100644 --- a/src/pip/_vendor/pkg_resources/__init__.py +++ b/src/pip/_vendor/pkg_resources/__init__.py -@@ -77,7 +77,7 @@ except ImportError: - importlib_machinery = None +@@ -77,7 +77,7 @@ + join_continuation, + ) - from . import py31compat -from pkg_resources.extern import appdirs +from pkg_resources.extern import platformdirs from pkg_resources.extern import packaging __import__('pkg_resources.extern.packaging.version') __import__('pkg_resources.extern.packaging.specifiers') -@@ -1310,7 +1310,7 @@ def get_default_cache(): +@@ -1321,7 +1321,7 @@ def get_default_cache(): """ return ( os.environ.get('PYTHON_EGG_CACHE') - or appdirs.user_cache_dir(appname='Python-Eggs') + or platformdirs.user_cache_dir(appname='Python-Eggs') ) - - + + +diff --git a/src/pip/_vendor/pkg_resources/__init__.py b/src/pip/_vendor/pkg_resources/__init__.py +index 3f2476a0c..8d5727d35 100644 +--- a/src/pip/_vendor/pkg_resources/__init__.py ++++ b/src/pip/_vendor/pkg_resources/__init__.py +@@ -71,7 +71,7 @@ + except ImportError: + importlib_machinery = None + +-from pkg_resources.extern.jaraco.text import ( ++from pip._internal.utils._jaraco_text import ( + yield_lines, + drop_comment, + join_continuation, |