diff options
| author | Nick Coghlan <ncoghlan@gmail.com> | 2017-02-09 16:08:17 +0100 |
|---|---|---|
| committer | Nick Coghlan <ncoghlan@gmail.com> | 2017-02-09 16:08:17 +0100 |
| commit | c6180bb73c8c7c7f9d8ea9816487b710597b6fc1 (patch) | |
| tree | fb4a5c18886537b4b7df46ed3b2aa579747ff507 /Modules/_io/stringio.c | |
| parent | 5e0114a832a903518c4af6983161c0c2a8942a24 (diff) | |
| parent | 819a21a3a4aac38f32e1ba4f68bcef45591fa3f0 (diff) | |
| download | cpython-c6180bb73c8c7c7f9d8ea9816487b710597b6fc1.tar.gz | |
Merge issue #26355 fix from Python 3.5
Diffstat (limited to 'Modules/_io/stringio.c')
| -rw-r--r-- | Modules/_io/stringio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_io/stringio.c b/Modules/_io/stringio.c index 06b4144578..8542efd972 100644 --- a/Modules/_io/stringio.c +++ b/Modules/_io/stringio.c @@ -438,7 +438,7 @@ stringio_iternext(stringio *self) _PyIO_str_readline, NULL); if (line && !PyUnicode_Check(line)) { PyErr_Format(PyExc_IOError, - "readline() should have returned an str object, " + "readline() should have returned a str object, " "not '%.200s'", Py_TYPE(line)->tp_name); Py_DECREF(line); return NULL; @@ -708,7 +708,7 @@ _io_StringIO___init___impl(stringio *self, PyObject *value, Py_TYPE(newline_obj)->tp_name); return -1; } - newline = _PyUnicode_AsString(newline_obj); + newline = PyUnicode_AsUTF8(newline_obj); if (newline == NULL) return -1; } |