From 1b328b314cd6b58ead41b0c9083782815b145fb7 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Wed, 30 Dec 2020 07:08:34 +0900 Subject: [PATCH] Imported Upstream version 50.0.2 --- .bumpversion.cfg | 2 +- CHANGES.rst | 6 ++++++ _distutils_hack/__init__.py | 2 +- setup.cfg | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index ebb58d3..e297316 100644 --- 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 0082b7f..435a7b4 100644 --- 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 b8410e1..2bc6df7 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/setup.cfg b/setup.cfg index 71839ef..0101bb8 100644 --- 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 -- 2.34.1