Backport of r59082 (doctest and using __loader__.get_data()).

This commit is contained in:
Brett Cannon 2007-11-21 00:58:54 +00:00
parent 946a51c187
commit d3a81df178
3 changed files with 24 additions and 1 deletions

View file

@ -209,7 +209,10 @@ def _load_testfile(filename, package, module_relative):
filename = _module_relative_path(package, filename)
if hasattr(package, '__loader__'):
if hasattr(package.__loader__, 'get_data'):
return package.__loader__.get_data(filename), filename
file_contents = package.__loader__.get_data(filename)
# get_data() opens files as 'rb', so one must do the equivalent
# conversion as universal newlines would do.
return file_contents.replace(os.linesep, '\n'), filename
return open(filename).read(), filename
def _indent(s, indent=4):