[Python-checkins] CVS: python/dist/src/Objects stringobject.c,2.92,2.93

Guido van Rossum python-dev@python.org
Mon, 27 Nov 2000 10:46:29 -0800


Update of /cvsroot/python/python/dist/src/Objects
In directory slayer.i.sourceforge.net:/tmp/cvs-serv22459

Modified Files:
	stringobject.c 
Log Message:
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.


Index: stringobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/stringobject.c,v
retrieving revision 2.92
retrieving revision 2.93
diff -C2 -r2.92 -r2.93
*** stringobject.c	2000/10/24 19:57:45	2.92
--- stringobject.c	2000/11/27 18:46:26	2.93
***************
*** 836,840 ****
  				Py_DECREF(res);
  				Py_DECREF(seq);
! 				return PyUnicode_Join((PyObject *)self, seq);
  			}
  			PyErr_Format(PyExc_TypeError,
--- 836,840 ----
  				Py_DECREF(res);
  				Py_DECREF(seq);
! 				return PyUnicode_Join((PyObject *)self, orig);
  			}
  			PyErr_Format(PyExc_TypeError,