Merge w/ 3.3 more fixes thanks to issue #17098

2 files changed, 14 insertions, 2 deletions

diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
index 8949365..6b2221d 100644
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -1724,10 +1724,13 @@ def _setup(sys_module, _imp_module):
         BYTECODE_SUFFIXES = DEBUG_BYTECODE_SUFFIXES
 
     module_type = type(sys)
-    for module in sys.modules.values():
+    for name, module in sys.modules.items():
         if isinstance(module, module_type):
             if not hasattr(module, '__loader__'):
-                module.__loader__ = BuiltinImporter
+                if name in sys.builtin_module_names:
+                    module.__loader__ = BuiltinImporter
+                elif _imp.is_frozen(name):
+                    module.__loader__ = FrozenImporter
 
     self_module = sys.modules[__name__]
     for builtin_name in ('_io', '_warnings', 'builtins', 'marshal'):
diff --git a/Lib/test/test_importlib/test_api.py b/Lib/test/test_importlib/test_api.py
index 7acb4ce..b39ab09 100644
--- a/Lib/test/test_importlib/test_api.py
+++ b/Lib/test/test_importlib/test_api.py
@@ -1,6 +1,7 @@
 from . import util
 import imp
 import importlib
+from importlib import _bootstrap
 from importlib import machinery
 import sys
 from test import support
@@ -184,6 +185,14 @@ class StartupTests(unittest.TestCase):
             if isinstance(module, types.ModuleType):
                 self.assertTrue(hasattr(module, '__loader__'),
                         '{!r} lacks a __loader__ attribute'.format(name))
+                if name in sys.builtin_module_names:
+                    self.assertIn(module.__loader__,
+                            (importlib.machinery.BuiltinImporter,
+                             importlib._bootstrap.BuiltinImporter))
+                elif imp.is_frozen(name):
+                    self.assertIn(module.__loader__,
+                            (importlib.machinery.FrozenImporter,
+                             importlib._bootstrap.FrozenImporter))
 
 
 if __name__ == '__main__':