Trap AttributeError in exactly one place.

6b5a5872 · Jason R. Coombs · GitHub · 7db9dc2f · 6b5a5872
Commit 6b5a5872 authored Mar 21, 2020 by Jason R. Coombs Committed by GitHub Mar 21, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 8 deletions

pkg_resources/__init__.py pkg_resources/__init__.py +4 -8

No files found.
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2102,14 +2102,10 @@ def _handle_ns(packageName, path_item):
    try:
        loader = importer.find_spec(packageName).loader
    except AttributeError:
-        try:
-            # capture warnings due to #1111
-            with warnings.catch_warnings():
-                warnings.simplefilter("ignore")
-                loader = importer.find_module(packageName)
-        except AttributeError:
-            # not a system module
-            loader = None
+        # capture warnings due to #1111
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore")
+            loader = importer.find_module(packageName)

    if loader is None:
        return None