From c9d13ee722b603ea4e7c0892b976464e61a7906b Mon Sep 17 00:00:00 2001
From: Matt Davis <mrd@redhat.com>
Date: Mon, 6 Dec 2021 16:35:37 -0800
Subject: [PATCH 1/2] fix failures w/ py3-only loaders

---
 pkg_resources/__init__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 955fdc48b6..850ca4da87 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

From 9caec1fe2de94409a5928bc5b60366c83174c769 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 10 Jan 2022 20:43:52 -0500
Subject: [PATCH 2/2] Update changelog.

---
 changelog.d/2918.misc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2918.misc.rst

diff --git a/changelog.d/2918.misc.rst b/changelog.d/2918.misc.rst
new file mode 100644
index 0000000000..9f61d787f1
--- /dev/null
+++ b/changelog.d/2918.misc.rst
@@ -0,0 +1 @@
+Correct support for Python 3 native loaders.