Suppress distutils replacement when building or testing CPython. Fixes …

…#2965. Fixes #3007.
pypa · Jan 16, 2022 · 336facd · 336facd
1 parent 448b840
commit 336facd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/_distutils_hack/__init__.py b/_distutils_hack/__init__.py
@@ -89,6 +89,9 @@ def find_spec(self, fullname, path, target=None):
         return method()
 
     def spec_for_distutils(self):
+        if self.is_cpython():
+            return
+
         import importlib
         import importlib.abc
         import importlib.util
@@ -118,6 +121,14 @@ def exec_module(self, module):
             'distutils', DistutilsLoader(), origin=mod.__file__
         )
 
+    @staticmethod
+    def is_cpython():
+        """
+        Suppress supplying distutils for CPython (build and tests).
+        Ref #2965 and #3007.
+        """
+        return os.path.isfile('pybuilddir.txt')
+
     def spec_for_pip(self):
         """
         Ensure stdlib distutils when running under pip.

diff --git a/changelog.d/3031.misc.rst b/changelog.d/3031.misc.rst
@@ -0,0 +1 @@
+Suppress distutils replacement when building or testing CPython.
diff --git a/changelog.d/NNN.misc.rst b/changelog.d/NNN.misc.rst