From: Georg Brandl <georg@python.org>
Date: Sat, 13 Aug 2005 09:06:24 +0000 (+0000)
Subject: Complete backport of #1172785 fix.
X-Git-Tag: v2.4.2c1~105
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ccb5e4dd6527b19e1bfd1c3247deddaa6b12eddd;p=thirdparty%2FPython%2Fcpython.git

Complete backport of #1172785 fix.
---

diff --git a/Lib/doctest.py b/Lib/doctest.py
index 18125f6b4b4f..642b5223b906 100644
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -2472,6 +2472,7 @@ def script_from_examples(s):
           blah
        #
        #     Ho hum
+       <BLANKLINE>
        """
     output = []
     for piece in DocTestParser().parse(s):
diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py
index 0ae6b8d18010..1665c05414e2 100644
--- a/Lib/test/test_doctest.py
+++ b/Lib/test/test_doctest.py
@@ -1517,6 +1517,7 @@ words and expected output are converted to comments:
     ## 44
     #
     # Yee ha!
+    <BLANKLINE>
 
     >>> name = 'test.test_doctest.SampleNewStyleClass'
     >>> print doctest.testsource(test.test_doctest, name)
@@ -1525,6 +1526,7 @@ words and expected output are converted to comments:
     ## 1
     ## 2
     ## 3
+    <BLANKLINE>
 
     >>> name = 'test.test_doctest.SampleClass.a_classmethod'
     >>> print doctest.testsource(test.test_doctest, name)
@@ -1534,6 +1536,7 @@ words and expected output are converted to comments:
     print SampleClass(0).a_classmethod(10)
     # Expected:
     ## 12
+    <BLANKLINE>
 """
 
 def test_debug(): r"""