From: Anthony Baxter <anthonybaxter@gmail.com>
Date: Wed, 5 Dec 2001 05:19:51 +0000 (+0000)
Subject: backport of 1.21
X-Git-Tag: v2.1.2c1~67
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1454210d9fde9aa8d01dd0e341df3570a39f3094;p=thirdparty%2FPython%2Fcpython.git

backport of 1.21
SF bug [#473864] doctest expects spurios space.
Repair unlikely surprise due to magical softspace attr and the use of
print with a trailing comma in doctest examples.
---

diff --git a/Lib/doctest.py b/Lib/doctest.py
index c52a2955a7a0..942363e762b6 100644
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -450,9 +450,15 @@ class _SpoofOut:
         # that a trailing newline is missing.
         if guts and not guts.endswith("\n"):
             guts = guts + "\n"
+        # Prevent softspace from screwing up the next test case, in
+        # case they used print with a trailing comma in an example.
+        if hasattr(self, "softspace"):
+            del self.softspace
         return guts
     def clear(self):
         self.buf = []
+        if hasattr(self, "softspace"):
+            del self.softspace
     def flush(self):
         # JPython calls flush
         pass