diff options
| -rw-r--r-- | Lib/importlib/_bootstrap.py | 7 | ||||
| -rw-r--r-- | Lib/importlib/test/import_/test_caching.py | 18 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 23 insertions, 5 deletions
diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py index ee3f1e6..24bcff2 100644 --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -860,7 +860,12 @@ def _gcd_import(name, package=None, level=0): name = package[:dot] with _ImportLockContext(): try: - return sys.modules[name] + module = sys.modules[name] + if module is None: + message = ("import of {} halted; " + "None in sys.modules".format(name)) + raise ImportError(message) + return module except KeyError: pass parent = name.rpartition('.')[0] diff --git a/Lib/importlib/test/import_/test_caching.py b/Lib/importlib/test/import_/test_caching.py index cf65b23..530b1a0 100644 --- a/Lib/importlib/test/import_/test_caching.py +++ b/Lib/importlib/test/import_/test_caching.py @@ -17,15 +17,25 @@ class UseCache(unittest.TestCase): loader returns) [from cache on return]. This also applies to imports of things contained within a package and thus get assigned as an attribute [from cache to attribute] or pulled in thanks to a fromlist import - [from cache for fromlist]. + [from cache for fromlist]. But if sys.modules contains None then + ImportError is raised [None in cache]. """ def test_using_cache(self): # [use cache] module_to_use = "some module found!" - sys.modules['some_module'] = module_to_use - module = import_util.import_('some_module') - self.assertEqual(id(module_to_use), id(module)) + with util.uncache(module_to_use): + sys.modules['some_module'] = module_to_use + module = import_util.import_('some_module') + self.assertEqual(id(module_to_use), id(module)) + + def test_None_in_cache(self): + #[None in cache] + name = 'using_None' + with util.uncache(name): + sys.modules[name] = None + with self.assertRaises(ImportError): + import_util.import_(name) def create_mock(self, *names, return_=None): mock = util.mock_modules(*names) @@ -50,6 +50,9 @@ C-API Library ------- +- Have importlib raise ImportError if None is found in sys.modules for a + module. + - Issue #6794: Fix Decimal.compare_total and Decimal.compare_total_mag: NaN payloads are now ordered by integer value rather than lexicographically. |