Kill off softspace completely (except in formatter.py which seems to have
a different feature with the same name).
The change to test_doctest.txt reduces the doctest failures to 3.
diff --git a/Lib/doctest.py b/Lib/doctest.py
index 210e845..02e200d 100644
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -240,16 +240,10 @@
# that a trailing newline is missing.
if result and not result.endswith("\n"):
result += "\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 result
- def truncate(self, size=None):
+ def truncate(self, size=None):
StringIO.truncate(self, size)
- if hasattr(self, "softspace"):
- del self.softspace
# Worst-case linear-time ellipsis matching.
def _ellipsis_match(want, got):