merge for issue #18755

This commit is contained in:
Brett Cannon 2013-08-23 11:52:19 -04:00
commit 16ababc213
2 changed files with 16 additions and 2 deletions

View file

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