merge 3.3

fc6f4cd3 · Benjamin Peterson · 2e8457d0 · aa6f688b · fc6f4cd3
Kaydet (Commit) fc6f4cd3 authored May 11, 2013 tarafından Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

test_imp.py Lib/test/test_imp.py +2 -1

No files found.
--- a/Lib/test/test_imp.py
+++ b/Lib/test/test_imp.py
@@ -267,7 +267,8 @@ class ImportTests(unittest.TestCase):
        # Issue #15902
        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:])