summaryrefslogtreecommitdiffstats
path: root/Python/sysmodule.c
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-02-09 23:20:19 (GMT)
committerGuido van Rossum <guido@python.org>2007-02-09 23:20:19 (GMT)
commit79139b247b0bc0bc1b1a12932140bbd4bc188df7 (patch)
treefef7ef79dcb4e2a1ca033e725b1c2d802e9447d2 /Python/sysmodule.c
parentbdc36e4d9e754dd00f17f67a943217a1829c75b3 (diff)
downloadcpython-79139b247b0bc0bc1b1a12932140bbd4bc188df7.zip
cpython-79139b247b0bc0bc1b1a12932140bbd4bc188df7.tar.gz
cpython-79139b247b0bc0bc1b1a12932140bbd4bc188df7.tar.bz2
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.
Diffstat (limited to 'Python/sysmodule.c')
-rw-r--r--Python/sysmodule.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 3f2d5b7..c7d85933 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -104,8 +104,6 @@ sys_displayhook(PyObject *self, PyObject *o)
}
if (PyObject_SetAttrString(builtins, "_", Py_None) != 0)
return NULL;
- if (Py_FlushLine() != 0)
- return NULL;
outf = PySys_GetObject("stdout");
if (outf == NULL) {
PyErr_SetString(PyExc_RuntimeError, "lost sys.stdout");
@@ -113,8 +111,7 @@ sys_displayhook(PyObject *self, PyObject *o)
}
if (PyFile_WriteObject(o, outf, 0) != 0)
return NULL;
- PyFile_SoftSpace(outf, 1);
- if (Py_FlushLine() != 0)
+ if (PyFile_WriteString("\n", outf) != 0)
return NULL;
if (PyObject_SetAttrString(builtins, "_", o) != 0)
return NULL;