commit 21e0da228d158ec248be5c7db274a7bc54a51307
author Benjamin Peterson <benjamin@python.org> Wed Jan 11 21:00:42 2012 -0500
committer Benjamin Peterson <benjamin@python.org> Wed Jan 11 21:00:42 2012 -0500
tree 0982086d2e9631949626820ee61dac8d4b8482cb
parent 22ef4fa7e9805312c83b595b27218443c367dcd0

remove some usage of Py_UNICODE_TOUPPER/LOWER

Python/_warnings.c

diff --git a/Python/_warnings.c b/Python/_warnings.c
index 458e346..adebd51 100644
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -510,13 +510,14 @@
         kind = PyUnicode_KIND(*filename);
         data = PyUnicode_DATA(*filename);
 
+#define ascii_lower(c) ((c <= 127) ? Py_TOLOWER(c) : 0)
         /* if filename.lower().endswith((".pyc", ".pyo")): */
         if (len >= 4 &&
             PyUnicode_READ(kind, data, len-4) == '.' &&
-            Py_UNICODE_TOLOWER(PyUnicode_READ(kind, data, len-3)) == 'p' &&
-            Py_UNICODE_TOLOWER(PyUnicode_READ(kind, data, len-2)) == 'y' &&
-            (Py_UNICODE_TOLOWER(PyUnicode_READ(kind, data, len-1)) == 'c' ||
-                Py_UNICODE_TOLOWER(PyUnicode_READ(kind, data, len-1)) == 'o'))
+            ascii_lower(PyUnicode_READ(kind, data, len-3)) == 'p' &&
+            ascii_lower(PyUnicode_READ(kind, data, len-2)) == 'y' &&
+            (ascii_lower(PyUnicode_READ(kind, data, len-1)) == 'c' ||
+                ascii_lower(PyUnicode_READ(kind, data, len-1)) == 'o'))
         {
             *filename = PyUnicode_Substring(*filename, 0,
                                             PyUnicode_GET_LENGTH(*filename)-1);

Python/formatter_unicode.c

diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c
index ef01511..12b880d 100644
--- a/Python/formatter_unicode.c
+++ b/Python/formatter_unicode.c
@@ -561,13 +561,14 @@
             return -1;
         if (toupper) {
             Py_ssize_t t;
-            /* XXX if the upper-case prefix is wider than the target
-               buffer, the caller should have allocated a wider string,
-               but currently doesn't. */
-            for (t = 0; t < spec->n_prefix; ++t)
-                PyUnicode_WRITE(kind, data, pos + t,
-                                Py_UNICODE_TOUPPER(
-                                    PyUnicode_READ(kind, data, pos + t)));
+            for (t = 0; t < spec->n_prefix; t++) {
+                Py_UCS4 c = PyUnicode_READ(kind, data, pos + t);
+                if (c > 127) {
+                    PyErr_SetString(PyExc_SystemError, "prefix not ASCII");
+                    return -1;
+                }
+                PyUnicode_WRITE(kind, data, pos + t, Py_TOUPPER(c));
+            }
         }
         pos += spec->n_prefix;
     }
@@ -607,10 +608,14 @@
     }
     if (toupper) {
         Py_ssize_t t;
-        for (t = 0; t < spec->n_grouped_digits; ++t)
-            PyUnicode_WRITE(kind, data, pos + t,
-                            Py_UNICODE_TOUPPER(
-                                PyUnicode_READ(kind, data, pos + t)));
+        for (t = 0; t < spec->n_grouped_digits; t++) {
+            Py_UCS4 c = PyUnicode_READ(kind, data, pos + t);
+            if (c > 127) {
+                PyErr_SetString(PyExc_SystemError, "non-ascii grouped digit");
+                return -1;
+            }
+            PyUnicode_WRITE(kind, data, pos + t, Py_TOUPPER(c));
+        }
     }
     pos += spec->n_grouped_digits;