Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge

This commit is contained in:
Antoine Pitrou 2012-05-12 19:02:47 +02:00
parent 424246fbf3 758153badb
commit 04b2e69e67
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Objects/unicodeobject.c
View File

@ -9075,12 +9075,15 @@ PyUnicode_Count(PyObject *str,
kind1 = PyUnicode_KIND(str_obj); kind1 = PyUnicode_KIND(str_obj);
kind2 = PyUnicode_KIND(sub_obj); kind2 = PyUnicode_KIND(sub_obj);
kind = kind2; kind = kind1;
buf1 = PyUnicode_DATA(str_obj); buf1 = PyUnicode_DATA(str_obj);
buf2 = PyUnicode_DATA(sub_obj); buf2 = PyUnicode_DATA(sub_obj);
if (kind2 != kind) { if (kind2 != kind) {
if (kind2 > kind) if (kind2 > kind) {
return 0; Py_DECREF(sub_obj);
Py_DECREF(str_obj);
return 0;
}
buf2 = _PyUnicode_AsKind(sub_obj, kind); buf2 = _PyUnicode_AsKind(sub_obj, kind);
} }
if (!buf2) if (!buf2)
@ -10659,8 +10662,11 @@ PyUnicode_Contains(PyObject *container, PyObject *element)
buf1 = PyUnicode_DATA(str); buf1 = PyUnicode_DATA(str);
buf2 = PyUnicode_DATA(sub); buf2 = PyUnicode_DATA(sub);
if (kind2 != kind) { if (kind2 != kind) {
if (kind2 > kind) if (kind2 > kind) {
Py_DECREF(sub);
Py_DECREF(str);
return 0; return 0;
}
buf2 = _PyUnicode_AsKind(sub, kind); buf2 = _PyUnicode_AsKind(sub, kind);
} }
if (!buf2) { if (!buf2) {