mirror of https://github.com/python/cpython.git
Cray fixup as seen in bug #558153.
This commit is contained in:
parent
543fb35cca
commit
b6a4505123
|
@ -1785,7 +1785,7 @@ deepcopy(PyObject** object, PyObject* memo)
|
|||
#endif
|
||||
|
||||
static PyObject*
|
||||
join(PyObject* list, PyObject* pattern)
|
||||
join_list(PyObject* list, PyObject* pattern)
|
||||
{
|
||||
/* join list elements */
|
||||
|
||||
|
@ -2238,7 +2238,7 @@ pattern_subx(PatternObject* self, PyObject* template, PyObject* string,
|
|||
Py_DECREF(filter);
|
||||
|
||||
/* convert list to single string (also removes list) */
|
||||
item = join(list, self->pattern);
|
||||
item = join_list(list, self->pattern);
|
||||
|
||||
if (!item)
|
||||
return NULL;
|
||||
|
|
Loading…
Reference in New Issue