From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 11 May 2013 21:29:11 +0000 (-0500)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~747
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc6f4cd39804ef5b54d461ec0023c44ed3a0e0ed;p=python

merge 3.3
---

fc6f4cd39804ef5b54d461ec0023c44ed3a0e0ed
diff --cc Lib/test/test_imp.py
index f46a1f5863,fe436f3985..7b85948e94
--- a/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:])