[Python-checkins] r52301 - in python/trunk: Lib/test/test_StringIO.py Misc/NEWS Modules/cStringIO.c
georg.brandl
python-checkins at python.org
Thu Oct 12 11:47:14 CEST 2006
Author: georg.brandl
Date: Thu Oct 12 11:47:12 2006
New Revision: 52301
Modified:
python/trunk/Lib/test/test_StringIO.py
python/trunk/Misc/NEWS
python/trunk/Modules/cStringIO.c
Log:
Bug #1548891: The cStringIO.StringIO() constructor now encodes unicode
arguments with the system default encoding just like the write()
method does, instead of converting it to a raw buffer.
Modified: python/trunk/Lib/test/test_StringIO.py
==============================================================================
--- python/trunk/Lib/test/test_StringIO.py (original)
+++ python/trunk/Lib/test/test_StringIO.py Thu Oct 12 11:47:12 2006
@@ -120,6 +120,28 @@
class TestcStringIO(TestGenericStringIO):
MODULE = cStringIO
+ def test_unicode(self):
+
+ if not test_support.have_unicode: return
+
+ # The cStringIO module converts Unicode strings to character
+ # strings when writing them to cStringIO objects.
+ # Check that this works.
+
+ f = self.MODULE.StringIO()
+ f.write(unicode(self._line[:5]))
+ s = f.getvalue()
+ self.assertEqual(s, 'abcde')
+ self.assertEqual(type(s), types.StringType)
+
+ f = self.MODULE.StringIO(unicode(self._line[:5]))
+ s = f.getvalue()
+ self.assertEqual(s, 'abcde')
+ self.assertEqual(type(s), types.StringType)
+
+ self.assertRaises(UnicodeEncodeError, self.MODULE.StringIO,
+ unicode('\xf4', 'latin-1'))
+
import sys
if sys.platform.startswith('java'):
# Jython doesn't have a buffer object, so we just do a useless
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS (original)
+++ python/trunk/Misc/NEWS Thu Oct 12 11:47:12 2006
@@ -131,6 +131,10 @@
Extension Modules
-----------------
+- Bug #1548891: The cStringIO.StringIO() constructor now encodes unicode
+ arguments with the system default encoding just like the write()
+ method does, instead of converting it to a raw buffer.
+
- Patch #1572724: fix typo ('=' instead of '==') in _msi.c.
- Bug #1572832: fix a bug in ISO-2022 codecs which may cause segfault
Modified: python/trunk/Modules/cStringIO.c
==============================================================================
--- python/trunk/Modules/cStringIO.c (original)
+++ python/trunk/Modules/cStringIO.c Thu Oct 12 11:47:12 2006
@@ -657,11 +657,9 @@
char *buf;
Py_ssize_t size;
- if (PyObject_AsReadBuffer(s, (const void **)&buf, &size)) {
- PyErr_Format(PyExc_TypeError, "expected read buffer, %.200s found",
- s->ob_type->tp_name);
+ if (PyObject_AsCharBuffer(s, (const void **)&buf, &size) != 0)
return NULL;
- }
+
self = PyObject_New(Iobject, &Itype);
if (!self) return NULL;
Py_INCREF(s);
More information about the Python-checkins
mailing list