mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 08:34:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Patch # 1140 (my code, approved by Effbot).

Browse source 
Make sure the type of the return value of re.sub(x, y, z) is the type
of y+x (i.e. unicode if either is unicode, str if they are both str)
even if there are no substitutions or if x==z (which triggered various
special cases in join_list()).

Could be backported to 2.5; no need to port to 3.0.
This commit is contained in:
Guido van Rossum 2007-09-10 22:02:25 +00:00
parent 98d19dafd9
commit 1ff91d95a2
2 changed files with 33 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Modules/_sre.c
View file

@ -1979,7 +1979,7 @@ deepcopy(PyObject** object, PyObject* memo)
#endif
static PyObject*
join_list(PyObject* list, PyObject* pattern)
join_list(PyObject* list, PyObject* string)
{
/* join list elements */
@ -1990,24 +1990,15 @@ join_list(PyObject* list, PyObject* pattern)
#endif
PyObject* result;
switch (PyList_GET_SIZE(list)) {
case 0:
Py_DECREF(list);
return PySequence_GetSlice(pattern, 0, 0);
case 1:
result = PyList_GET_ITEM(list, 0);
Py_INCREF(result);
Py_DECREF(list);
return result;
}
/* two or more elements: slice out a suitable separator from the
first member, and use that to join the entire list */
joiner = PySequence_GetSlice(pattern, 0, 0);
joiner = PySequence_GetSlice(string, 0, 0);
if (!joiner)
return NULL;
if (PyList_GET_SIZE(list) == 0) {
Py_DECREF(list);
return joiner;
}
#if PY_VERSION_HEX >= 0x01060000
function = PyObject_GetAttrString(joiner, "join");
if (!function) {
@ -2443,7 +2434,7 @@ next:
Py_DECREF(filter);
/* convert list to single string (also removes list) */
item = join_list(list, self->pattern);
item = join_list(list, string);
if (!item)
return NULL;