Extract function for ensure_local_distuils

9962c0af · Jason R. Coombs · 4ac101a1 · 9962c0af
Commit 9962c0af authored May 31, 2020 by Jason R. Coombs
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

setuptools/distutils_patch.py setuptools/distutils_patch.py +6 -4

No files found.
--- a/setuptools/distutils_patch.py
+++ b/setuptools/distutils_patch.py
@@ -21,9 +21,11 @@ def patch_sys_path():
        sys.path[:] = orig


-if 'distutils' in sys.path:
-    raise RuntimeError("Distutils must not be imported before setuptools")
+def ensure_local_distutils():
+    if 'distutils' in sys.path:
+        raise RuntimeError("Distutils must not be imported before setuptools")
+    with patch_sys_path():
+        importlib.import_module('distutils')


-with patch_sys_path():
-    importlib.import_module('distutils')
+ensure_local_distutils()