diff options
author | Brett Cannon <brett@python.org> | 2013-08-23 15:52:19 (GMT) |
---|---|---|
committer | Brett Cannon <brett@python.org> | 2013-08-23 15:52:19 (GMT) |
commit | 16ababc2133b7c9cfadfcf669769faf68255ed52 (patch) | |
tree | ece10b057072a8411011b6199a8b3bcaa759f418 /Lib/imp.py | |
parent | f9f045896124148dc518b7d35f8faf1e2862c571 (diff) | |
parent | a4975a911d17d8baa96570794fa6db19c0676a2a (diff) | |
download | cpython-16ababc2133b7c9cfadfcf669769faf68255ed52.zip cpython-16ababc2133b7c9cfadfcf669769faf68255ed52.tar.gz cpython-16ababc2133b7c9cfadfcf669769faf68255ed52.tar.bz2 |
merge for issue #18755
Diffstat (limited to 'Lib/imp.py')
-rw-r--r-- | Lib/imp.py | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -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) |