Avoid _distutils_hack.remove_shim on Python >= 3.12 (#3952)

Author: abravalheri

_distutils_hack/__init__.py

@@ -142,7 +142,7 @@ def spec_for_pip(self):
         Ensure stdlib distutils when running under pip.
         See pypa/pip#8761 for rationale.
         """
-        if self.pip_imported_during_build():
+        if sys.version_info >= (3, 12) or self.pip_imported_during_build():
             return
         clear_distutils()
         self.spec_for_distutils = lambda: None
@@ -208,15 +208,20 @@ def __enter__(self):
         insert_shim()
 
     def __exit__(self, exc, value, tb):
-        remove_shim()
+        _remove_shim()
 
 
 def insert_shim():
     sys.meta_path.insert(0, DISTUTILS_FINDER)
 
 
-def remove_shim():
+def _remove_shim():
     try:
         sys.meta_path.remove(DISTUTILS_FINDER)
     except ValueError:
         pass
+
+
+if sys.version_info < (3, 12):
+    # DistutilsMetaFinder can only be disabled in Python < 3.12 (PEP 632)
+    remove_shim = _remove_shim

changelog.d/3952.change.1.rst

@@ -0,0 +1 @@
+Changed ``DistutilsMetaFinder`` to skip ``spec_for_pip`` on Python >= 3.12.

changelog.d/3952.change.2.rst

@@ -0,0 +1,3 @@
+Removed ``_distutils_hack.remove_shim`` on Python >= 3.12
+(since ``distutils`` was removed from the standard library,
+``DistutilsMetaFinder`` cannot be disabled on Python >= 3.12).

setuptools/sandbox.py

@@ -237,7 +237,7 @@ def hide_setuptools():
     """
     _distutils_hack = sys.modules.get('_distutils_hack', None)
     if _distutils_hack is not None:
-        _distutils_hack.remove_shim()
+        _distutils_hack._remove_shim()
 
     modules = filter(_needs_hiding, sys.modules)
     _clear_modules(modules)