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

[brett.cannon]

http://hg.python.org/cpython/rev/fb8dd0fc86d9
changeset:   81972:fb8dd0fc86d9
parent:      81966:6c4857832510
parent:      81971:fbeb79714f98
user:        Brett Cannon <brett at python.org>
date:        Sun Feb 03 11:38:16 2013 -0500
summary:
  merge

files:
  Lib/test/test_importlib/test_api.py |  4 ++++
  1 files changed, 4 insertions(+), 0 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,6 +183,10 @@
         # 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:

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