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

merge 3.3 (#17863)

This commit is contained in:
Benjamin Peterson 2013-04-29 10:23:31 -04:00
parent 5c089314ef fe1b22af0a
commit 0bb83f812f
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

@ -10,6 +10,9 @@ What's New in Python 3.4.0 Alpha 1?
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,

17
Python/pythonrun.c
View File

@ -1255,16 +1255,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) {