[Python-checkins] cpython (merge default -> default): merge
brett.cannon
python-checkins at python.org
Fri Apr 27 23:33:07 CEST 2012
http://hg.python.org/cpython/rev/69ea85992b3d
changeset: 76587:69ea85992b3d
parent: 76586:496c68f90a03
parent: 76585:d27440b2f318
user: Brett Cannon <brett at python.org>
date: Fri Apr 27 17:27:33 2012 -0400
summary:
merge
files:
Objects/unicodeobject.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -1985,6 +1985,9 @@
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;
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list