Imported Upstream version 50.0.2

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index ebb58d3b1c76f6d8236cdfb695c65127d5c7b07c..e2973162e88f2e5b369a2c01f00d816a0dd03e0f 100644 (file)
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 50.0.1
+current_version = 50.0.2
 commit = True
 tag = True
 

diff --git a/CHANGES.rst b/CHANGES.rst
index 0082b7f30b932beb92e47ebd5eb790bdf469933f..435a7b4699bdd9030219214be0d43eb018791926 100644 (file)
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v50.0.2
+-------
+
+* #2352: In distutils hack, use absolute import rather than relative to avoid bpo-30876.
+
+
 v50.0.1
 -------
 

diff --git a/_distutils_hack/__init__.py b/_distutils_hack/__init__.py
index b8410e1fc8783a43fc57c7d248f55e1740b8f161..2bc6df7ac7589c3c0725553ff58cba2a3f7bc883 100644 (file)
--- 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/setup.cfg b/setup.cfg
index 71839ef1d76850dea7b1603e87cda105c0a77d67..0101bb868358d657c18ef14321ed138020c24058 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 50.0.1
+version = 50.0.2
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org