]> git.ipfire.org Git - thirdparty/Python/cpython.git/commit
It's merge time!
authorMichael W. Hudson <mwh@python.net>
Mon, 28 Jan 2002 15:00:27 +0000 (15:00 +0000)
committerMichael W. Hudson <mwh@python.net>
Mon, 28 Jan 2002 15:00:27 +0000 (15:00 +0000)
commitd7238ec33fb4d3465eeb56bf6883a28855144f79
treecc506f8b067246d14f5973bfd905374fefc16f42
parent48f97f39f38e2719ab1aa95b7ed751ec3ff84c8a
It's merge time!

Backport lemburg's checkin of revision 1.20:

Restore Python 2.1 StringIO.py behaviour: support concatenating
Unicode string snippets to larger Unicode strings.

This fix should also go into Python 2.2.1.
Lib/StringIO.py