Commit 7f81a6c6 authored by Guido van Rossum's avatar Guido van Rossum

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.
parent a04a1e5b
...@@ -835,7 +835,7 @@ string_join(PyStringObject *self, PyObject *args) ...@@ -835,7 +835,7 @@ string_join(PyStringObject *self, PyObject *args)
if (PyUnicode_Check(item)) { if (PyUnicode_Check(item)) {
Py_DECREF(res); Py_DECREF(res);
Py_DECREF(seq); Py_DECREF(seq);
return PyUnicode_Join((PyObject *)self, seq); return PyUnicode_Join((PyObject *)self, orig);
} }
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"sequence item %i: expected string," "sequence item %i: expected string,"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment