From e10e5fc4adb0a260dcd69c7fa99b55d3389eb356 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 1 Jun 2020 18:01:38 +0200 Subject: [PATCH] only ever catch ImportError (#69792) ModuleNotFoundError is a subclass of ImportError but only exists in Python 3.6 or newer. Instead of doing hacks to be able to catch that on older Pythons, just always only catch ImportError, which will also catch ModuleNotFoundError on Python 3.6 or later --- lib/ansible/plugins/loader.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/ansible/plugins/loader.py b/lib/ansible/plugins/loader.py index 1c4139329bf..3dd024e8605 100644 --- a/lib/ansible/plugins/loader.py +++ b/lib/ansible/plugins/loader.py @@ -50,12 +50,6 @@ try: except ImportError: import imp -try: - ModuleNotFoundError -except NameError: - # this was introduced in Python 3.6 - ModuleNotFoundError = None - display = Display() _tombstones = None @@ -493,7 +487,7 @@ class PluginLoader: # FIXME: there must be cheaper/safer way to do this try: pkg = import_module(acr.n_python_package_name) - except (ImportError, ModuleNotFoundError): + except ImportError: return plugin_load_context.nope('Python package {0} not found'.format(acr.n_python_package_name)) pkg_path = os.path.dirname(pkg.__file__)