merge 3.3

diff --cc Lib/test/test_imp.py
index f46a1f5863fb0f3bd53ef5e6fd67b3f91bb8b638,fe436f3985012e3ed63502e2eab64574625e88d3..7b85948e94d3b64b190744b611dc4d3ed858dc4f
--- 1/Lib/test/test_imp.py
--- 2/Lib/test/test_imp.py
+++ b/Lib/test/test_imp.py
@@@ -265,9 -239,10 +265,10 @@@ class ImportTests(unittest.TestCase)
          # When loading an extension module and the file is None, open one
          # on the behalf of imp.load_dynamic().
          # Issue #15902
 -        name = '_heapq'
 +        name = '_testimportmultiple'
          found = imp.find_module(name)
-         found[0].close()
+         if found[0] is not None:
+             found[0].close()
          if found[2][2] != imp.C_EXTENSION:
              return
          imp.load_module(name, None, *found[1:])