Merge pull request #11315 from bdrosen96/brett/fix_pip_attribute

pypa · Jul 30, 2022 · 74f850d · 74f850d
2 parents 4fd08e1 + 50eb337
commit 74f850d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/news/11314.bugfix.rst b/news/11314.bugfix.rst
@@ -0,0 +1 @@
+Avoid  ``AttributeError`` when removing the setuptools-provided ``_distutils_hack`` and it is missing its implementation.
diff --git a/src/pip/_internal/locations/_distutils.py b/src/pip/_internal/locations/_distutils.py
@@ -11,7 +11,7 @@
 # rationale for why this is done within pip.
 try:
     __import__("_distutils_hack").remove_shim()
-except ImportError:
+except (ImportError, AttributeError):
     pass
 
 import logging
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Avoid ``AttributeError`` when removing the setuptools-provided ``_distutils_hack`` and it is missing its implementation.