Complete backport of #1172785 fix.

diff --git a/Lib/doctest.py b/Lib/doctest.py
index 18125f6b4b4f5b014778bff6fa900e58f67865a6..642b5223b906d6e8e7a34f5f6db0396981eed167 100644 (file)
--- 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 0ae6b8d180105e30a7c930d82ec52759d3b3be3d..1665c05414e2160684e10e96cfbcbcb1cc840a04 100644 (file)
--- 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"""