From 6b5a5872503290d6c90ab18cd72e46776977064a Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 21 Mar 2020 05:41:02 -0400 Subject: Trap AttributeError in exactly one place. --- pkg_resources/__init__.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'pkg_resources') diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py index deea96b9..2f6c0cbf 100644 --- 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 -- cgit v1.2.3