mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-08 20:05:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Issue #18818: The "encodingname" part of PYTHONIOENCODING is now optional.

Browse source
This commit is contained in:
Serhiy Storchaka 2013-09-13 11:46:24 +03:00
parent 187b063005
commit bf28d2dcad
4 changed files with 56 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Python/pythonrun.c
View file

@ -1056,7 +1056,7 @@ initstdio(void)
PyObject *std = NULL;
int status = 0, fd;
PyObject * encoding_attr;
char *encoding = NULL, *errors;
char *pythonioencoding = NULL, *encoding, *errors;
/* Hack to avoid a nasty recursion issue when Python is invoked
in verbose mode: pre-import the Latin-1 and UTF-8 codecs */
@ -1088,19 +1088,23 @@ initstdio(void)
}
Py_DECREF(wrapper);
encoding = Py_GETENV("PYTHONIOENCODING");
errors = NULL;
if (encoding) {
encoding = _PyMem_Strdup(encoding);
if (encoding == NULL) {
pythonioencoding = Py_GETENV("PYTHONIOENCODING");
encoding = errors = NULL;
if (pythonioencoding) {
pythonioencoding = _PyMem_Strdup(pythonioencoding);
if (pythonioencoding == NULL) {
PyErr_NoMemory();
goto error;
}
errors = strchr(encoding, ':');
errors = strchr(pythonioencoding, ':');
if (errors) {
*errors = '\0';
errors++;
if (!*errors)
errors = NULL;
}
if (*pythonioencoding)
encoding = pythonioencoding;
}
/* Set sys.stdin */
@ -1180,7 +1184,7 @@ initstdio(void)
status = -1;
}
PyMem_Free(encoding);
PyMem_Free(pythonioencoding);
Py_XDECREF(bimod);
Py_XDECREF(iomod);
return status;