From bb9fb1fcfe37c1ef1e29e1e6d1fc4e483c743380 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jul 2020 03:53:46 -0400
Subject: Move distutils into a submodule of setuptools.

---
 setuptools/distutils_patch.py | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

(limited to 'setuptools/distutils_patch.py')

diff --git a/setuptools/distutils_patch.py b/setuptools/distutils_patch.py
index f9e63798..06eed82f 100644
--- a/setuptools/distutils_patch.py
+++ b/setuptools/distutils_patch.py
@@ -8,19 +8,7 @@ for more motivation.
 import sys
 import re
 import importlib
-import contextlib
 import warnings
-from os.path import dirname
-
-
-@contextlib.contextmanager
-def patch_sys_path():
-    orig = sys.path[:]
-    sys.path[:] = [dirname(dirname(__file__))]
-    try:
-        yield
-    finally:
-        sys.path[:] = orig
 
 
 def clear_distutils():
@@ -34,9 +22,12 @@ def clear_distutils():
 
 def ensure_local_distutils():
     clear_distutils()
-    with patch_sys_path():
-        importlib.import_module('distutils')
-        assert sys.modules['distutils'].local
+    distutils = importlib.import_module('setuptools._distutils')
+    sys.modules['distutils'] = distutils
+
+    # sanity check that submodules load as expected
+    core = importlib.import_module('distutils.core')
+    assert '_distutils' in core.__file__, core.__file__
 
 
 ensure_local_distutils()
-- 
cgit v1.2.1