diff options
| author | Brett Cannon <bcannon@gmail.com> | 2007-11-21 00:47:36 (GMT) |
|---|---|---|
| committer | Brett Cannon <bcannon@gmail.com> | 2007-11-21 00:47:36 (GMT) |
| commit | 43e53f85b6f5e77a2f09cbda5833ffba5fbbdb2a (patch) | |
| tree | 369e908698ea14e519aa00e646e912a7c22d391e /Lib/doctest.py | |
| parent | 901071bde5eda2189cd396095bbb8934d4fa66b3 (diff) | |
| download | cpython-43e53f85b6f5e77a2f09cbda5833ffba5fbbdb2a.zip cpython-43e53f85b6f5e77a2f09cbda5833ffba5fbbdb2a.tar.gz cpython-43e53f85b6f5e77a2f09cbda5833ffba5fbbdb2a.tar.bz2 | |
doctest assumed that a package's __loader__.get_data() method used universal
newlines; it doesn't. To rectify this the string returned replaces all
instances of os.linesep with '\n' to fake universal newline support.
Backport candidate.
Diffstat (limited to 'Lib/doctest.py')
| -rw-r--r-- | Lib/doctest.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/doctest.py b/Lib/doctest.py index 0db59ba..e874a26 100644 --- a/Lib/doctest.py +++ b/Lib/doctest.py @@ -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): |