mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-10 04:45:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

merge 3.3 (#17863)

Browse source
This commit is contained in:
Benjamin Peterson 2013-04-29 10:23:31 -04:00
commit 0bb83f812f
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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) {