In ensure_local_distutils, re-use DistutilsMetaFinder to load the module. Avoids race conditions when _distutils_system_mod is employed and fixes #2906.

jaraco · jaraco · commit 485fa84d85da · 2021-11-26T12:50:02.000-05:00
diff --git a/_distutils_hack/__init__.py b/_distutils_hack/__init__.py
@@ -48,11 +48,15 @@ def enabled():
 
 def ensure_local_distutils():
     clear_distutils()
-    distutils = importlib.import_module('setuptools._distutils')
-    distutils.__name__ = 'distutils'
-    sys.modules['distutils'] = distutils
 
-    # sanity check that submodules load as expected
+    # ensure the DistutilsMetaFinder is in place and
+    # perform an import to cause distutils to be
+    # loaded from setuptools._distutils. Ref #2906.
+    add_shim()
+    importlib.import_module('distutils')
+    remove_shim()
+
+    # check that submodules load as expected
     core = importlib.import_module('distutils.core')
     assert '_distutils' in core.__file__, core.__file__
 
diff --git a/changelog.d/2906.misc.rst b/changelog.d/2906.misc.rst
@@ -0,0 +1 @@
+In ensure_local_distutils, re-use DistutilsMetaFinder to load the module. Avoids race conditions when _distutils_system_mod is employed.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+In ensure_local_distutils, re-use DistutilsMetaFinder to load the module. Avoids race conditions when _distutils_system_mod is employed.`