summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2020-09-01 17:11:12 -0400
committerGitHub <noreply@github.com>2020-09-01 17:11:12 -0400
commit1e3c63b27d461afd6e2a75209ac99b814b06ad7c (patch)
treea2d70324d980ae53cd0293f662d9585cac92b23b
parentdb378e28cc70ec4ed3c21dfbd255c9ea54a861c8 (diff)
parenta3319a388913facb5b9236c938ba9adabd5b9fdd (diff)
downloadpython-setuptools-git-1e3c63b27d461afd6e2a75209ac99b814b06ad7c.tar.gz
Merge pull request #2369 from pypa/bugfix/2352-relative-import-distutils-hack
In distutils hack, use absolute import rather than relative to avoid bpo-30876.
-rw-r--r--_distutils_hack/__init__.py2
-rw-r--r--changelog.d/2352.misc.rst1
2 files changed, 2 insertions, 1 deletions
diff --git a/_distutils_hack/__init__.py b/_distutils_hack/__init__.py
index b8410e1f..2bc6df7a 100644
--- a/_distutils_hack/__init__.py
+++ b/_distutils_hack/__init__.py
@@ -80,7 +80,7 @@ class DistutilsMetaFinder:
class DistutilsLoader(importlib.abc.Loader):
def create_module(self, spec):
- return importlib.import_module('._distutils', 'setuptools')
+ return importlib.import_module('setuptools._distutils')
def exec_module(self, module):
pass
diff --git a/changelog.d/2352.misc.rst b/changelog.d/2352.misc.rst
new file mode 100644
index 00000000..79dda996
--- /dev/null
+++ b/changelog.d/2352.misc.rst
@@ -0,0 +1 @@
+In distutils hack, use absolute import rather than relative to avoid bpo-30876.