]> granicus.if.org Git - python/commitdiff
Fix logic error introduced by 83da67651687.
authorAntoine Pitrou <solipsis@pitrou.net>
Sat, 12 May 2012 13:49:07 +0000 (15:49 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Sat, 12 May 2012 13:49:07 +0000 (15:49 +0200)
Objects/unicodeobject.c

index 9db87be3615f96edbe1bc276d27ec07f3366c289..97de48f4f80f63ec87b56ea930eb2f6d603e63f3 100644 (file)
@@ -9075,12 +9075,12 @@ PyUnicode_Count(PyObject *str,
 
     kind1 = PyUnicode_KIND(str_obj);
     kind2 = PyUnicode_KIND(sub_obj);
-    kind = kind2;
+    kind = kind1;
     buf1 = PyUnicode_DATA(str_obj);
     buf2 = PyUnicode_DATA(sub_obj);
     if (kind2 != kind) {
         if (kind2 > kind)
-            return 0;    
+            return 0;
         buf2 = _PyUnicode_AsKind(sub_obj, kind);
     }
     if (!buf2)