merge

brettcannon · brettcannon · commit 19b409a34106 · 2012-04-27T17:27:33.000-04:00
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -1985,6 +1985,9 @@ _PyUnicode_FindMaxChar(PyObject *unicode, Py_ssize_t start, Py_ssize_t end)
     if (start == end)
         return 127;
 
+    if (PyUnicode_IS_ASCII(unicode))
+        return 127;
+
     kind = PyUnicode_KIND(unicode);
     startptr = PyUnicode_DATA(unicode);
     endptr = (char *)startptr + end * kind;
