diff --git a/Lib/imp.py b/Lib/imp.py index 32e8998e505..ee6cfe2f01e 100644 --- a/Lib/imp.py +++ b/Lib/imp.py @@ -140,13 +140,18 @@ class _HackedGetData: def get_data(self, path): """Gross hack to contort loader to deal w/ load_*()'s bad API.""" if self.file and path == self.path: - with self.file: + if not self.file.closed: + file = self.file + else: + self.file = file = open(self.path, 'r') + + with file: # Technically should be returning bytes, but # SourceLoader.get_code() just passed what is returned to # compile() which can handle str. And converting to bytes would # require figuring out the encoding to decode to and # tokenize.detect_encoding() only accepts bytes. - return self.file.read() + return file.read() else: return super().get_data(path) diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py index 8eb56f6c057..586a97c553f 100644 --- a/Lib/test/test_imp.py +++ b/Lib/test/test_imp.py @@ -275,6 +275,7 @@ class ImportTests(unittest.TestCase): return imp.load_module(name, None, *found[1:]) +<<<<<<< local @unittest.skipIf(sys.dont_write_bytecode, "test meaningful only when writing bytecode") def test_bug7732(self): @@ -283,6 +284,14 @@ class ImportTests(unittest.TestCase): os.mkdir(source) self.assertRaisesRegex(ImportError, '^No module', imp.find_module, support.TESTFN, ["."]) +======= + def test_multiple_calls_to_get_data(self): + # Issue #18755: make sure multiple calls to get_data() can succeed. + loader = imp._LoadSourceCompatibility('imp', imp.__file__, + open(imp.__file__)) + loader.get_data(imp.__file__) # File should be closed + loader.get_data(imp.__file__) # Will need to create a newly opened file +>>>>>>> other class ReloadTests(unittest.TestCase):