http://hg.python.org/cpython/rev/97522b189c79 changeset: 83552:97522b189c79 parent: 83550:393723b646a4 parent: 83551:68d1ac152b5d user: Benjamin Peterson <benjamin@python.org> date: Mon Apr 29 10:23:31 2013 -0400 summary: merge 3.3 (#17863) files: Misc/NEWS | 3 +++ Python/pythonrun.c | 17 ++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #17863: In the interactive console, don't loop forever if the encoding + can't be fetched from stdin. + - Issue #17867: Raise an ImportError if __import__ is not found in __builtins__. - Issue #17857: Prevent build failures with pre-3.5.0 versions of sqlite3, diff --git a/Python/pythonrun.c b/Python/pythonrun.c --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -1255,16 +1255,15 @@ _Py_IDENTIFIER(encoding); if (fp == stdin) { - /* Fetch encoding from sys.stdin */ + /* Fetch encoding from sys.stdin if possible. */ v = PySys_GetObject("stdin"); - if (v == NULL || v == Py_None) - return -1; - oenc = _PyObject_GetAttrId(v, &PyId_encoding); - if (!oenc) - return -1; - enc = _PyUnicode_AsString(oenc); - if (enc == NULL) - return -1; + if (v && v != Py_None) { + oenc = _PyObject_GetAttrId(v, &PyId_encoding); + if (oenc) + enc = _PyUnicode_AsString(oenc); + if (!enc) + PyErr_Clear(); + } } v = PySys_GetObject("ps1"); if (v != NULL) { -- Repository URL: http://hg.python.org/cpython