commit 14f8f02826bc270b2a0dab2ff2efc8ce88fd9dc0
author Victor Stinner <victor.stinner@haypocalc.com> Wed Oct 05 20:58:25 2011 +0200
committer Victor Stinner <victor.stinner@haypocalc.com> Wed Oct 05 20:58:25 2011 +0200
tree 5d4226a9ec5b25c01548188dc4623890f6709b83
parent 31392e741da2ceb5256ae626766d29454a0b5658

Fix PyUnicode_Partition(): str_in->str_obj

Objects/unicodeobject.c

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index f42d4af..f89a5f9 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -11694,12 +11694,12 @@
         return NULL;
     }
 
-    kind1 = PyUnicode_KIND(str_in);
+    kind1 = PyUnicode_KIND(str_obj);
     kind2 = PyUnicode_KIND(sep_obj);
-    kind = kind1 > kind2 ? kind1 : kind2;
-    buf1 = PyUnicode_DATA(str_in);
+    kind = Py_MAX(kind1, kind2);
+    buf1 = PyUnicode_DATA(str_obj);
     if (kind1 != kind)
-        buf1 = _PyUnicode_AsKind(str_in, kind);
+        buf1 = _PyUnicode_AsKind(str_obj, kind);
     if (!buf1)
         goto onError;
     buf2 = PyUnicode_DATA(sep_obj);
@@ -11710,7 +11710,7 @@
     len1 = PyUnicode_GET_LENGTH(str_obj);
     len2 = PyUnicode_GET_LENGTH(sep_obj);
 
-    switch(PyUnicode_KIND(str_in)) {
+    switch(PyUnicode_KIND(str_obj)) {
     case PyUnicode_1BYTE_KIND:
         out = ucs1lib_partition(str_obj, buf1, len1, sep_obj, buf2, len2);
         break;