commit e45c0c5cefaa634ce1bf9efe95523756c60917c7
author Antoine Pitrou <solipsis@pitrou.net> Sat May 12 15:49:07 2012 +0200
committer Antoine Pitrou <solipsis@pitrou.net> Sat May 12 15:49:07 2012 +0200
tree 3c3ff759ac5c9adadbd86acd23487e5806b87ac2
parent 4d688e3275d5a10e2321571392cdc31945bb8a89

Fix logic error introduced by 83da67651687.

Objects/unicodeobject.c

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 9db87be..97de48f 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -9075,12 +9075,12 @@
 
     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)