Backport of r59082 (doctest and using __loader__.get_data()).
diff --git a/Lib/doctest.py b/Lib/doctest.py
index 32d076a..d609c5d 100644
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -209,7 +209,10 @@
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):