From: Guido van Rossum <guido@python.org>
Date: Mon, 27 Nov 2000 18:46:26 +0000 (+0000)
Subject: SF patch #102548, fix for bug #121013, by mwh@users.sourceforge.net.
X-Git-Tag: v2.1a1~710
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ccda8a7c4b983c0b8776db570383911af26ee91;p=python

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.
---

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 757c1c4da4..31d1b05c60 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,"