traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ignore errors when trying to fetch sys.stdin.encoding (closes #17863)

This commit is contained in:
Benjamin Peterson 2013-04-29 10:23:08 -04:00
parent 7d110042c5
commit fe1b22af0a
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -12,6 +12,9 @@ What's New in Python 3.3.2?
Core and Builtins 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 #17867: Raise an ImportError if __import__ is not found in __builtins__.
- Issue #17857: Prevent build failures with pre-3.5.0 versions of sqlite3, - Issue #17857: Prevent build failures with pre-3.5.0 versions of sqlite3,

17
Python/pythonrun.c
View File

@ -1237,16 +1237,15 @@ PyRun_InteractiveOneFlags(FILE *fp, const char *filename, PyCompilerFlags *flags
_Py_IDENTIFIER(encoding); _Py_IDENTIFIER(encoding);
if (fp == stdin) { if (fp == stdin) {
/* Fetch encoding from sys.stdin */ /* Fetch encoding from sys.stdin if possible. */
v = PySys_GetObject("stdin"); v = PySys_GetObject("stdin");
if (v == NULL || v == Py_None) if (v && v != Py_None) {
return -1; oenc = _PyObject_GetAttrId(v, &PyId_encoding);
oenc = _PyObject_GetAttrId(v, &PyId_encoding); if (oenc)
if (!oenc) enc = _PyUnicode_AsString(oenc);
return -1; if (!enc)
enc = _PyUnicode_AsString(oenc); PyErr_Clear();
if (enc == NULL) }
return -1;
} }
v = PySys_GetObject("ps1"); v = PySys_GetObject("ps1");
if (v != NULL) { if (v != NULL) {