merge w/ 3.3

diff --cc Lib/test/test_importlib/test_api.py
index 7dda1ff9cdb4b5b8c23330615133a6e5df5e1bee,b1a58944f3d7920613b70225bbeb881c0c914367..f66e257ee99c9476b5ddb73439a78c1598b25a54
--- 1/Lib/test/test_importlib/test_api.py
--- 2/Lib/test/test_importlib/test_api.py
+++ b/Lib/test/test_importlib/test_api.py
@@@ -183,20 -182,20 +183,14 @@@ class StartupTests(unittest.TestCase)
          # 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.assertEqual(importlib.machinery.BuiltinImporter,
 -                                     module.__loader__)
 +                    self.assertIn(module.__loader__,
 +                            (importlib.machinery.BuiltinImporter,
 +                             importlib._bootstrap.BuiltinImporter))
                  elif imp.is_frozen(name):
 -                    self.assertEqual(importlib.machinery.FrozenImporter,
 -                                     module.__loader__)
 -
 -def test_main():
 -    from test.support import run_unittest
 -    run_unittest(ImportModuleTests,
 -                 FindLoaderTests,
 -                 InvalidateCacheTests,
 -                 FrozenImportlibTests,
 -                 StartupTests)
 +                    self.assertIn(module.__loader__,
 +                            (importlib.machinery.FrozenImporter,
 +                             importlib._bootstrap.FrozenImporter))
  
  
  if __name__ == '__main__':