[Python-checkins] cpython: _io.textio: fix character type, use Py_UCS4 instead of Py_UNICODE

Thu Sep 29 04:03:20 CEST 2011

http://hg.python.org/cpython/rev/8f4b162f9f0e
changeset: 72518:8f4b162f9f0e
user: Victor Stinner <victor.stinner at haypocalc.com>
date: Thu Sep 29 03:28:17 2011 +0200
summary:
 _io.textio: fix character type, use Py_UCS4 instead of Py_UNICODE
files:
 Modules/_io/textio.c | 6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -347,7 +347,7 @@
 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 @@
 }
 
 
-/* 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 @@
 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) {
-- 
Repository URL: http://hg.python.org/cpython
