merge 3.3

This commit is contained in:
Benjamin Peterson
2013-05-11 16:29:11 -05:00

View File

@@ -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:])