mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 00:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Issue #25182: The stdprinter (used as sys.stderr before the io module is

Browse source 
imported at startup) now uses the backslashreplace error handler.
This commit is contained in:
Serhiy Storchaka 2015-09-30 15:51:01 +03:00
commit 85c386dee4
2 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Objects/fileobject.c
View file

@ -372,8 +372,11 @@ PyFile_NewStdPrinter(int fd)
static PyObject *
stdprinter_write(PyStdPrinter_Object *self, PyObject *args)
{
PyObject *unicode;
PyObject *bytes = NULL;
char *str;
Py_ssize_t n;
int _errno;
if (self->fd < 0) {
/* fd might be invalid on Windows
@ -383,13 +386,27 @@ stdprinter_write(PyStdPrinter_Object *self, PyObject *args)
Py_RETURN_NONE;
}
/* encode Unicode to UTF-8 */
if (!PyArg_ParseTuple(args, "s", &str))
if (!PyArg_ParseTuple(args, "U", &unicode))
return NULL;
n = _Py_write(self->fd, str, strlen(str));
/* encode Unicode to UTF-8 */
str = PyUnicode_AsUTF8AndSize(unicode, &n);
if (str == NULL) {
PyErr_Clear();
bytes = _PyUnicode_AsUTF8String(unicode, "backslashreplace");
if (bytes == NULL)
return NULL;
if (PyBytes_AsStringAndSize(bytes, &str, &n) < 0) {
Py_DECREF(bytes);
return NULL;
}
}
n = _Py_write(self->fd, str, n);
_errno = errno;
Py_XDECREF(bytes);
if (n == -1) {
if (errno == EAGAIN) {
if (_errno == EAGAIN) {
PyErr_Clear();
Py_RETURN_NONE;
}