From f7b8cb605d38342399de52cb865889e8a4daf81f Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 29 Sep 2011 03:28:17 +0200 Subject: [PATCH] _io.textio: fix character type, use Py_UCS4 instead of Py_UNICODE --- Modules/_io/textio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c index 9c06ec89c7d..880a5f0df55 100644 --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -347,7 +347,7 @@ _PyIncrementalNewlineDecoder_decode(PyObject *_self, memchr(in_str, '\n', PyUnicode_KIND_SIZE(kind, len)) != NULL) { Py_ssize_t i = 0; for (;;) { - Py_UNICODE c; + Py_UCS4 c; /* Fast loop for non-control characters */ while (PyUnicode_READ(kind, in_str, i) > '\n') i++; @@ -1570,7 +1570,7 @@ textiowrapper_read(textio *self, PyObject *args) } -/* NOTE: `end` must point to the real end of the Py_UNICODE storage, +/* NOTE: `end` must point to the real end of the Py_UCS4 storage, that is to the NUL character. Otherwise the function will produce incorrect results. */ static char * @@ -1614,7 +1614,7 @@ _PyIO_find_line_ending( for (;;) { Py_UCS4 ch; /* Fast path for non-control chars. The loop always ends - since the Py_UNICODE storage is NUL-terminated. */ + since the Unicode string is NUL-terminated. */ while (PyUnicode_READ(kind, s, 0) > '\r') s += size; if (s >= end) {