1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Patch #550192: Set softspace to 0 in raw_input().

Browse Source
This commit is contained in:
Martin v. Löwis 2002-08-14 15:46:02 +00:00
parent 04490bf225
commit 31d2df5b60
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Python/bltinmodule.c
View File

@ -1289,12 +1289,25 @@ static PyObject *
builtin_raw_input(PyObject *self, PyObject *args) builtin_raw_input(PyObject *self, PyObject *args)
{ {
PyObject *v = NULL; PyObject *v = NULL;
PyObject *f; PyObject *fin = PySys_GetObject("stdin");
PyObject *fout = PySys_GetObject("stdout");
if (!PyArg_ParseTuple(args, "|O:[raw_]input", &v)) if (!PyArg_ParseTuple(args, "|O:[raw_]input", &v))
return NULL; return NULL;
if (PyFile_AsFile(PySys_GetObject("stdin")) == stdin &&
PyFile_AsFile(PySys_GetObject("stdout")) == stdout && if (fin == NULL) {
PyErr_SetString(PyExc_RuntimeError, "lost sys.stdin");
return NULL;
}
if (fout == NULL) {
PyErr_SetString(PyExc_RuntimeError, "lost sys.stdout");
return NULL;
}
if (PyFile_SoftSpace(fout, 0)) {
if (PyFile_WriteString(" ", fout) != 0)
return NULL;
}
if (PyFile_AsFile(fin) == stdin && PyFile_AsFile(fout) == stdout &&
isatty(fileno(stdin)) && isatty(fileno(stdout))) { isatty(fileno(stdin)) && isatty(fileno(stdout))) {
PyObject *po; PyObject *po;
char *prompt; char *prompt;
@ -1325,32 +1338,23 @@ builtin_raw_input(PyObject *self, PyObject *args)
else { /* strip trailing '\n' */ else { /* strip trailing '\n' */
size_t len = strlen(s); size_t len = strlen(s);
if (len > INT_MAX) { if (len > INT_MAX) {
PyErr_SetString(PyExc_OverflowError, "input too long"); PyErr_SetString(PyExc_OverflowError,
"input too long");
result = NULL; result = NULL;
} }
else { else {
result = PyString_FromStringAndSize(s, (int)(len-1)); result = PyString_FromStringAndSize(s,
(int)(len-1));
} }
} }
PyMem_FREE(s); PyMem_FREE(s);
return result; return result;
} }
if (v != NULL) { if (v != NULL) {
f = PySys_GetObject("stdout"); if (PyFile_WriteObject(v, fout, Py_PRINT_RAW) != 0)
if (f == NULL) {
PyErr_SetString(PyExc_RuntimeError, "lost sys.stdout");
return NULL;
}
if (Py_FlushLine() != 0 ||
PyFile_WriteObject(v, f, Py_PRINT_RAW) != 0)
return NULL; return NULL;
} }
f = PySys_GetObject("stdin"); return PyFile_GetLine(fin, -1);
if (f == NULL) {
PyErr_SetString(PyExc_RuntimeError, "lost sys.stdin");
return NULL;
}
return PyFile_GetLine(f, -1);
} }
PyDoc_STRVAR(raw_input_doc, PyDoc_STRVAR(raw_input_doc,