summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2000-11-27 18:46:26 (GMT)
committerGuido van Rossum <guido@python.org>2000-11-27 18:46:26 (GMT)
commit2ccda8a7c4b983c0b8776db570383911af26ee91 (patch)
treebfae4513e9ee42122920a49c3d01cc8c5fa0755b /Objects
parentc113465a49c042ee9268e0978a31ab2e92b57c1b (diff)
downloadcpython-2ccda8a7c4b983c0b8776db570383911af26ee91.zip
cpython-2ccda8a7c4b983c0b8776db570383911af26ee91.tar.gz
cpython-2ccda8a7c4b983c0b8776db570383911af26ee91.tar.bz2
SF patch #102548, fix for bug #121013, by mwh@users.sourceforge.net.
Fixes a typo that caused "".join(u"this is a test") to dump core.
Diffstat (limited to 'Objects')
-rw-r--r--Objects/stringobject.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 757c1c4..31d1b05 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -835,7 +835,7 @@ string_join(PyStringObject *self, PyObject *args)
if (PyUnicode_Check(item)) {
Py_DECREF(res);
Py_DECREF(seq);
- return PyUnicode_Join((PyObject *)self, seq);
+ return PyUnicode_Join((PyObject *)self, orig);
}
PyErr_Format(PyExc_TypeError,
"sequence item %i: expected string,"