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

[brett.cannon]

http://hg.python.org/cpython/rev/6f95d202fe86
changeset:   81981:6f95d202fe86
parent:      81979:d8c5f2e73a69
parent:      81980:94c3f4176725
user:        Brett Cannon <brett at python.org>
date:        Sun Feb 03 16:16:44 2013 -0500
summary:
  merge w/ 3.3

files:
  Lib/test/test_importlib/test_api.py |  6 ------
  1 files changed, 0 insertions(+), 6 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
@@ -183,12 +183,6 @@
         # Issue #17098: all modules should have __loader__ defined.
         for name, module in sys.modules.items():
             if isinstance(module, types.ModuleType):
-                # pyexpat/xml.parsers.expat have submodules that it creates
-                # by hand and do not set __loader__, which is acceptable.
-                if 'expat' in name:
-                    continue
-                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,

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