ignore errors when trying to fetch sys.stdin.encoding (closes #17863)
This commit is contained in:
parent
7d110042c5
commit
fe1b22af0a
|
@ -12,6 +12,9 @@ What's New in Python 3.3.2?
|
|||
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,
|
||||
|
|
|
@ -1237,16 +1237,15 @@ PyRun_InteractiveOneFlags(FILE *fp, const char *filename, PyCompilerFlags *flags
|
|||
_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) {
|
||||
|
|
Loading…
Reference in New Issue