From: JinWang An <jinwang.an@samsung.com>
Date: Mon, 27 Mar 2023 08:02:43 +0000 (+0900)
Subject: Imported Upstream version 60.5.1
X-Git-Tag: upstream/60.5.1^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b38f639585489b6ee25bd6b8aea14d39ba2d4135;p=platform%2Fupstream%2Fpython-setuptools.git

Imported Upstream version 60.5.1
---

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 542ed84..5d0f65a 100644
--- 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 dd6cef7..6ae4a26 100644
--- 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 2fee370..f07b27e 100644
--- 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 f98516d..9cc6b0a 100644
--- 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 e91d8ae..9676b13 100644
--- 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