summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael W. Hudson <mwh@python.net>2002-07-31 09:54:24 (GMT)
committerMichael W. Hudson <mwh@python.net>2002-07-31 09:54:24 (GMT)
commitb6a45051234fd17ce1bedc1d91af1de9f630f162 (patch)
tree14b7681c41949c4f6a1b731a63b7450c64199eda
parent543fb35cca90b94f6d841a7081bb918eb6eb7c84 (diff)
downloadcpython-b6a45051234fd17ce1bedc1d91af1de9f630f162.zip
cpython-b6a45051234fd17ce1bedc1d91af1de9f630f162.tar.gz
cpython-b6a45051234fd17ce1bedc1d91af1de9f630f162.tar.bz2
Cray fixup as seen in bug #558153.
-rw-r--r--Modules/_sre.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_sre.c b/Modules/_sre.c
index 5805d5c..f4dbef0 100644
--- a/Modules/_sre.c
+++ b/Modules/_sre.c
@@ -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 @@ next:
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;