From 8e2f5564b3cce162aa1427dcd26092f24f418418 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Mon, 2 Jul 2012 14:53:10 -0400 Subject: Issue #15210: If _frozen_importlib is not found in sys.modules by importlib.__init__, then catch the KeyError raised, not ImportError. --- Lib/importlib/test/test_api.py | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'Lib/importlib/test/test_api.py') diff --git a/Lib/importlib/test/test_api.py b/Lib/importlib/test/test_api.py index b7d6cb4eff..8431eab6f7 100644 --- a/Lib/importlib/test/test_api.py +++ b/Lib/importlib/test/test_api.py @@ -160,9 +160,30 @@ class InvalidateCacheTests(unittest.TestCase): importlib.invalidate_caches() # Shouldn't trigger an exception. +class FrozenImportlibTests(unittest.TestCase): + + def test_no_frozen_importlib(self): + # Should be able to import w/o _frozen_importlib being defined. + modules = {} + for name in ('importlib', 'importlib.__init__', 'importlib._bootstrap', + '_frozen_importlib'): + try: + modules[name] = sys.modules[name] + del sys.modules[name] + except KeyError: + continue + modules['_frozen_importlib'] = None + import importlib + for name, module in modules.items(): + sys.modules[name] = module + + def test_main(): from test.support import run_unittest - run_unittest(ImportModuleTests, FindLoaderTests, InvalidateCacheTests) + run_unittest(ImportModuleTests, + FindLoaderTests, + InvalidateCacheTests, + FrozenImportlibTests) if __name__ == '__main__': -- cgit v1.2.1