Merge pull request #2990 from asottile/distutils-hack-set-origin

set origin= for distutils.__spec__
pypa · Jan 8, 2022 · d514fa1 · d514fa1
2 parents 82b9723 + bd8d4db
commit d514fa1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/_distutils_hack/__init__.py b/_distutils_hack/__init__.py
@@ -125,7 +125,9 @@ def create_module(self, spec):
             def exec_module(self, module):
                 pass
 
-        return importlib.util.spec_from_loader('distutils', DistutilsLoader())
+        return importlib.util.spec_from_loader(
+            'distutils', DistutilsLoader(), origin=mod.__file__
+        )
 
     def spec_for_pip(self):
         """

diff --git a/changelog.d/2990.change.rst b/changelog.d/2990.change.rst
@@ -0,0 +1 @@
+Set the ``.origin`` attribute of the ``distutils`` module to the module's ``__file__``.
diff --git a/setuptools/tests/test_distutils_adoption.py b/setuptools/tests/test_distutils_adoption.py
@@ -86,3 +86,10 @@ def test_pip_import(venv):
     """
     cmd = ['python', '-c', 'import pip']
     popen_text(venv.run)(cmd)
+
+
+def test_distutils_has_origin():
+    """
+    Distutils module spec should have an origin. #2990.
+    """
+    assert __import__('distutils').__spec__.origin
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Set the ``.origin`` attribute of the ``distutils`` module to the module's ``__file__``.