mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-12 13:55:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Issue #24402: Merge input() fix from 3.4 into 3.5

Browse source
This commit is contained in:
Martin Panter 2015-10-10 01:55:23 +00:00
commit e02f8fc44d
3 changed files with 116 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Python/bltinmodule.c
View file

@ -1853,8 +1853,10 @@ builtin_input_impl(PyModuleDef *module, PyObject *prompt)
}
if (tty) {
tmp = _PyObject_CallMethodId(fout, &PyId_fileno, "");
if (tmp == NULL)
if (tmp == NULL) {
PyErr_Clear();
tty = 0;
}
else {
fd = PyLong_AsLong(tmp);
Py_DECREF(tmp);