traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #18755: Allow imp.load_*() loaders to have get_data() called 

multiple times.
This commit is contained in:
Brett Cannon 2013-08-23 11:45:57 -04:00
parent f5ebd26403
commit a4975a911d
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Lib/imp.py
View File

@ -90,13 +90,18 @@ class _HackedGetData:
def get_data(self, path): def get_data(self, path):
"""Gross hack to contort loader to deal w/ load_*()'s bad API.""" """Gross hack to contort loader to deal w/ load_*()'s bad API."""
if self.file and path == self.path: 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 # Technically should be returning bytes, but
# SourceLoader.get_code() just passed what is returned to # SourceLoader.get_code() just passed what is returned to
# compile() which can handle str. And converting to bytes would # compile() which can handle str. And converting to bytes would
# require figuring out the encoding to decode to and # require figuring out the encoding to decode to and
# tokenize.detect_encoding() only accepts bytes. # tokenize.detect_encoding() only accepts bytes.
return self.file.read() return file.read()
else: else:
return super().get_data(path) return super().get_data(path)

7
Lib/test/test_imp.py
View File

@ -248,6 +248,13 @@ class ImportTests(unittest.TestCase):
return return
imp.load_module(name, None, *found[1:]) imp.load_module(name, None, *found[1:])
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
class ReloadTests(unittest.TestCase): class ReloadTests(unittest.TestCase):