[Python-checkins] cpython (3.4): #8473: Add tests that doctest uses universal newlines in testfile.

r.david.murray python-checkins at python.org
Fri Oct 3 04:44:36 CEST 2014


https://hg.python.org/cpython/rev/e6050cd9e29e
changeset:   92764:e6050cd9e29e
branch:      3.4
parent:      92761:1e0156aef491
user:        R David Murray <rdmurray at bitdance.com>
date:        Thu Oct 02 22:42:42 2014 -0400
summary:
  #8473: Add tests that doctest uses universal newlines in testfile.

Python3 does not have the bug covered by the issue.

files:
  Lib/test/test_doctest.py |  30 ++++++++++++++++++++++++++++
  1 files changed, 30 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py
--- a/Lib/test/test_doctest.py
+++ b/Lib/test/test_doctest.py
@@ -2613,6 +2613,36 @@
     >>> sys.argv = save_argv
 """
 
+def test_lineendings(): r"""
+*nix systems use \n line endings, while Windows systems use \r\n.  Python
+handles this using universal newline mode for reading files.  Let's make
+sure doctest does so (issue 8473) by creating temporary test files using each
+of the two line disciplines.  One of the two will be the "wrong" one for the
+platform the test is run on.
+
+Windows line endings first:
+
+    >>> import tempfile, os
+    >>> fn = tempfile.mktemp()
+    >>> with open(fn, 'w') as f:
+    ...    f.write('Test:\r\n\r\n  >>> x = 1 + 1\r\n\r\nDone.\r\n')
+    35
+    >>> doctest.testfile(fn, False)
+    TestResults(failed=0, attempted=1)
+    >>> os.remove(fn)
+
+And now *nix line endings:
+
+    >>> fn = tempfile.mktemp()
+    >>> with open(fn, 'w') as f:
+    ...     f.write('Test:\n\n  >>> x = 1 + 1\n\nDone.\n')
+    30
+    >>> doctest.testfile(fn, False)
+    TestResults(failed=0, attempted=1)
+    >>> os.remove(fn)
+
+"""
+
 def test_testmod(): r"""
 Tests for the testmod function.  More might be useful, but for now we're just
 testing the case raised by Issue 6195, where trying to doctest a C module would

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list