[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3

[brett.cannon]

http://hg.python.org/cpython/rev/370882f297a4
changeset:   81883:370882f297a4
parent:      81870:1f1a1b3cc416
parent:      81882:4a4688b865ff
user:        Brett Cannon <brett at python.org>
date:        Fri Feb 01 14:51:43 2013 -0500
summary:
  merge with 3.3

files:
  Lib/test/test_importlib/test_api.py |  17 ++++++++++-------
  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
--- a/Lib/test/test_importlib/test_api.py
+++ b/Lib/test/test_importlib/test_api.py
@@ -4,6 +4,7 @@
 from importlib import machinery
 import sys
 from test import support
+import types
 import unittest
 
 
@@ -175,13 +176,15 @@
                                     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()

-- 
Repository URL: http://hg.python.org/cpython