Imported Upstream version 60.5.1

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 542ed8459ec0a9654130811d4c81430ae89f15a7..5d0f65ac12dadca8b6140e3c6d4d916fa261dffd 100644 (file)
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 60.5.0
+current_version = 60.5.1
 commit = True
 tag = True
 

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index dd6cef707bd2af3f47a3f14886ad9034ead12fef..6ae4a264be838b1f77d020223b8e28bb76f25200 100644 (file)
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -42,6 +42,7 @@ jobs:
             ${{ matrix.python }}
 
   test_cygwin:
+    if: ${{ false }}  # failing #3016
     strategy:
       matrix:
         distutils:

diff --git a/CHANGES.rst b/CHANGES.rst
index 2fee370f733848dc209cd38c35ef52cb70aab80d..f07b27e42cf852513919e61aef59e5ba9312db8a 100644 (file)
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+v60.5.1
+-------
+
+
+Misc
+^^^^
+* #2918: Correct support for Python 3 native loaders.
+
+
 v60.5.0
 -------
 

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index f98516d17e0a0924a372a0e5e6975d93f20e4aa7..9cc6b0a4d99c41183ef3cced09e5c9ea09dafec3 100644 (file)
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2205,12 +2205,14 @@ def _handle_ns(packageName, path_item):
 
     # use find_spec (PEP 451) and fall-back to find_module (PEP 302)
     try:
-        loader = importer.find_spec(packageName).loader
+        spec = importer.find_spec(packageName)
     except AttributeError:
         # capture warnings due to #1111
         with warnings.catch_warnings():
             warnings.simplefilter("ignore")
             loader = importer.find_module(packageName)
+    else:
+        loader = spec.loader if spec else None
 
     if loader is None:
         return None

diff --git a/setup.cfg b/setup.cfg
index e91d8aed47c1ce5f8e4e28a9123c6a3c10508c69..9676b131d1d06067b93d12da973db1eece714ab5 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = setuptools
-version = 60.5.0
+version = 60.5.1
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages