summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2013-08-23 15:45:57 (GMT)
committerBrett Cannon <brett@python.org>2013-08-23 15:45:57 (GMT)
commita4975a911d17d8baa96570794fa6db19c0676a2a (patch)
tree8b9dfc5d79c0b14d87fb274e4e8aef79ccc1c48a /Lib
parentf5ebd264032fbcb07a41a49031c2281f81c9a814 (diff)
downloadcpython-a4975a911d17d8baa96570794fa6db19c0676a2a.zip
cpython-a4975a911d17d8baa96570794fa6db19c0676a2a.tar.gz
cpython-a4975a911d17d8baa96570794fa6db19c0676a2a.tar.bz2
Issue #18755: Allow imp.load_*() loaders to have get_data() called
multiple times.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/imp.py9
-rw-r--r--Lib/test/test_imp.py7
2 files changed, 14 insertions, 2 deletions
diff --git a/Lib/imp.py b/Lib/imp.py
index 30c343f..4088383 100644
--- a/Lib/imp.py
+++ b/Lib/imp.py
@@ -90,13 +90,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 bf29e42..b56efe3 100644
--- a/Lib/test/test_imp.py
+++ b/Lib/test/test_imp.py
@@ -248,6 +248,13 @@ class ImportTests(unittest.TestCase):
return
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):