mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-19 17:25:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Make input9) behave properly with the new I/O library.

Browse source
This commit is contained in:
Guido van Rossum 2007-05-27 09:13:28 +00:00
parent f5bec7c67d
commit eba769657a
1 changed files with 66 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

80
Python/bltinmodule.c
View file

@ -1571,42 +1571,88 @@ end: string appended after the last value, default a newline.");
static PyObject * static PyObject *
builtin_input(PyObject *self, PyObject *args) builtin_input(PyObject *self, PyObject *args)
{ {
PyObject *v = NULL; PyObject *promptarg = NULL;
PyObject *fin = PySys_GetObject("stdin"); PyObject *fin = PySys_GetObject("stdin");
PyObject *fout = PySys_GetObject("stdout"); PyObject *fout = PySys_GetObject("stdout");
PyObject *ferr = PySys_GetObject("stderr");
PyObject *tmp;
long fd;
int tty;
if (!PyArg_UnpackTuple(args, "input", 0, 1, &v)) /* Parse arguments */
if (!PyArg_UnpackTuple(args, "input", 0, 1, &promptarg))
return NULL; return NULL;
/* Check that stdin/out/err are intact */
if (fin == NULL) { if (fin == NULL) {
PyErr_SetString(PyExc_RuntimeError, "input: lost sys.stdin"); PyErr_SetString(PyExc_RuntimeError,
"input(): lost sys.stdin");
return NULL; return NULL;
} }
if (fout == NULL) { if (fout == NULL) {
PyErr_SetString(PyExc_RuntimeError, "input: lost sys.stdout"); PyErr_SetString(PyExc_RuntimeError,
"input(): lost sys.stdout");
return NULL; return NULL;
} }
if (PyFile_AsFile(fin) && PyFile_AsFile(fout) if (ferr == NULL) {
&& isatty(fileno(PyFile_AsFile(fin))) PyErr_SetString(PyExc_RuntimeError,
&& isatty(fileno(PyFile_AsFile(fout)))) { "input(): lost sys.stderr");
return NULL;
}
/* First of all, flush stderr */
tmp = PyObject_CallMethod(ferr, "flush", "");
if (tmp == NULL)
return NULL;
Py_DECREF(tmp);
/* We should only use (GNU) readline if Python's sys.stdin and
sys.stdout are the same as C's stdin and stdout, because we
need to pass it those. */
tmp = PyObject_CallMethod(fin, "fileno", "");
if (tmp == NULL)
return NULL;
fd = PyInt_AsLong(tmp);
if (fd < 0 && PyErr_Occurred())
return NULL;
Py_DECREF(tmp);
tty = fd == fileno(stdin) && isatty(fd);
if (tty) {
tmp = PyObject_CallMethod(fout, "fileno", "");
if (tmp == NULL)
return NULL;
fd = PyInt_AsLong(tmp);
Py_DECREF(tmp);
if (fd < 0 && PyErr_Occurred())
return NULL;
tty = fd == fileno(stdout) && isatty(fd);
}
/* If we're interactive, use (GNU) readline */
if (tty) {
PyObject *po; PyObject *po;
char *prompt; char *prompt;
char *s; char *s;
PyObject *result; PyObject *result;
if (v != NULL) { tmp = PyObject_CallMethod(fout, "flush", "");
po = PyObject_Str(v); if (tmp == NULL)
return NULL;
Py_DECREF(tmp);
if (promptarg != NULL) {
po = PyObject_Str(promptarg);
if (po == NULL) if (po == NULL)
return NULL; return NULL;
prompt = PyString_AsString(po); prompt = PyString_AsString(po);
if (prompt == NULL) if (prompt == NULL) {
Py_DECREF(po);
return NULL; return NULL;
} }
}
else { else {
po = NULL; po = NULL;
prompt = ""; prompt = "";
} }
s = PyOS_Readline(PyFile_AsFile(fin), PyFile_AsFile(fout), s = PyOS_Readline(stdin, stdout, prompt);
prompt);
Py_XDECREF(po); Py_XDECREF(po);
if (s == NULL) { if (s == NULL) {
if (!PyErr_Occurred()) if (!PyErr_Occurred())
@ -1631,10 +1677,16 @@ builtin_input(PyObject *self, PyObject *args)
PyMem_FREE(s); PyMem_FREE(s);
return result; return result;
} }
if (v != NULL) {
if (PyFile_WriteObject(v, fout, Py_PRINT_RAW) != 0) /* Fallback if we're not interactive */
if (promptarg != NULL) {
if (PyFile_WriteObject(promptarg, fout, Py_PRINT_RAW) != 0)
return NULL; return NULL;
} }
tmp = PyObject_CallMethod(fout, "flush", "");
if (tmp == NULL)
return NULL;
Py_DECREF(tmp);
return PyFile_GetLine(fin, -1); return PyFile_GetLine(fin, -1);
} }