Rename _distutils_importer to _distutils_hack, as it supplies more than just an importer.

7 files changed, 7 insertions, 7 deletions

diff --git a/_distutils_importer/__init__.py b/_distutils_hack/__init__.py
index 3ad70100..3ad70100 100644
--- a/_distutils_importer/__init__.py
+++ b/_distutils_hack/__init__.py
diff --git a/_distutils_importer/install.py b/_distutils_hack/install.py
index 73f13b29..73f13b29 100644
--- a/_distutils_importer/install.py
+++ b/_distutils_hack/install.py
diff --git a/_distutils_importer/override.py b/_distutils_hack/override.py
index 523139bb..523139bb 100644
--- a/_distutils_importer/override.py
+++ b/_distutils_hack/override.py
diff --git a/conftest.py b/conftest.py
index 868bf5be..25537f56 100644
--- a/conftest.py
+++ b/conftest.py
@@ -15,7 +15,7 @@ collect_ignore = [
     'tests/manual_test.py',
     'setuptools/tests/mod_with_constant.py',
     'setuptools/_distutils',
-    '_distutils_importer',
+    '_distutils_hack',
 ]
 
 
diff --git a/setup.py b/setup.py
index a6e1abc4..2d8bdf85 100755
--- a/setup.py
+++ b/setup.py
@@ -95,7 +95,7 @@ class install_with_pth(install):
     def initialize_options(self):
         install.initialize_options(self)
         self.extra_path = (
-            'distutils-precedence', 'import _distutils_importer.install')
+            'distutils-precedence', 'import _distutils_hack.install')
 
     def finalize_options(self):
         install.finalize_options(self)
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 80b287b4..99094230 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -5,7 +5,7 @@ import functools
 import os
 import re
 
-import _distutils_importer.override  # noqa: F401
+import _distutils_hack.override  # noqa: F401
 
 import distutils.core
 from distutils.errors import DistutilsOptionError
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 342a713f..24a36080 100644
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -200,7 +200,7 @@ _MODULES_TO_HIDE = {
     'distutils',
     'pkg_resources',
     'Cython',
-    '_distutils_importer',
+    '_distutils_hack',
 }
 
 
@@ -232,9 +232,9 @@ def hide_setuptools():
     necessary to avoid issues such as #315 where setuptools upgrading itself
     would fail to find a function declared in the metadata.
     """
-    _distutils_importer = sys.modules.get('_distutils_importer', None)
-    if _distutils_importer is not None:
-        _distutils_importer.remove_shim()
+    _distutils_hack = sys.modules.get('_distutils_hack', None)
+    if _distutils_hack is not None:
+        _distutils_hack.remove_shim()
 
     modules = filter(_needs_hiding, sys.modules)
     _clear_modules(modules)