merge with 3.3

1 files changed, 10 insertions, 7 deletions

diff --git a/Lib/test/test_importlib/test_api.py b/Lib/test/test_importlib/test_api.py
index ef6629a..7acb4ce 100644
--- a/Lib/test/test_importlib/test_api.py
+++ b/Lib/test/test_importlib/test_api.py
@@ -4,6 +4,7 @@ import importlib
 from importlib import machinery
 import sys
 from test import support
+import types
 import unittest
 
 
@@ -175,13 +176,15 @@ class FrozenImportlibTests(unittest.TestCase):
                                     machinery.FrozenImporter))
 
 
-def test_main():
-    from test.support import run_unittest
-    run_unittest(ImportModuleTests,
-                 FindLoaderTests,
-                 InvalidateCacheTests,
-                 FrozenImportlibTests)
+class StartupTests(unittest.TestCase):
+
+    def test_everyone_has___loader__(self):
+        # Issue #17098: all modules should have __loader__ defined.
+        for name, module in sys.modules.items():
+            if isinstance(module, types.ModuleType):
+                self.assertTrue(hasattr(module, '__loader__'),
+                        '{!r} lacks a __loader__ attribute'.format(name))
 
 
 if __name__ == '__main__':
-    test_main()
+    unittest.main()