[Python-checkins] r59085 - in python/branches/release25-maint: Lib/doctest.py Lib/test/test_doctest.py Misc/NEWS
brett.cannon
python-checkins at python.org
Wed Nov 21 01:58:54 CET 2007
Author: brett.cannon
Date: Wed Nov 21 01:58:54 2007
New Revision: 59085
Modified:
python/branches/release25-maint/Lib/doctest.py
python/branches/release25-maint/Lib/test/test_doctest.py
python/branches/release25-maint/Misc/NEWS
Log:
Backport of r59082 (doctest and using __loader__.get_data()).
Modified: python/branches/release25-maint/Lib/doctest.py
==============================================================================
--- python/branches/release25-maint/Lib/doctest.py (original)
+++ python/branches/release25-maint/Lib/doctest.py Wed Nov 21 01:58:54 2007
@@ -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):
Modified: python/branches/release25-maint/Lib/test/test_doctest.py
==============================================================================
--- python/branches/release25-maint/Lib/test/test_doctest.py (original)
+++ python/branches/release25-maint/Lib/test/test_doctest.py Wed Nov 21 01:58:54 2007
@@ -1908,6 +1908,24 @@
>>> suite.run(unittest.TestResult())
<unittest.TestResult run=3 errors=0 failures=3>
+ Support for using a package's __loader__.get_data() is also
+ provided.
+
+ >>> import unittest, pkgutil, test
+ >>> if not hasattr(test, '__loader__'):
+ ... test.__loader__ = pkgutil.get_loader(test)
+ ... added_loader = True
+ >>> try:
+ ... suite = doctest.DocFileSuite('test_doctest.txt',
+ ... 'test_doctest2.txt',
+ ... 'test_doctest4.txt',
+ ... package='test')
+ ... suite.run(unittest.TestResult())
+ ... finally:
+ ... if added_loader:
+ ... del test.__loader__
+ <unittest.TestResult run=3 errors=0 failures=3>
+
'/' should be used as a path separator. It will be converted
to a native separator at run time:
Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS (original)
+++ python/branches/release25-maint/Misc/NEWS Wed Nov 21 01:58:54 2007
@@ -38,6 +38,8 @@
Library
-------
+- doctest mis-used __loader__.get_data(), assuming universal newlines was used.
+
- Issue #1705170: contextlib.contextmanager was still swallowing
StopIteration in some cases. This should no longer happen.
More information about the Python-checkins
mailing list