Merge pull request #11315 from bdrosen96/brett/fix_pip_attribute

uranusjr · web-flow · commit 74f850db9403 · 2022-07-30T09:52:30.000+08:00
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 @@`
	`1`	+Avoid ``AttributeError`` when removing the setuptools-provided ``_distutils_hack`` and it is missing its implementation.