[Python-checkins] r56830 - in python/trunk: Doc/lib/libstringio.tex Lib/test/test_StringIO.py Misc/NEWS Modules/cStringIO.c
georg.brandl
python-checkins at python.org
Wed Aug 8 15:03:42 CEST 2007
Author: georg.brandl
Date: Wed Aug 8 15:03:41 2007
New Revision: 56830
Modified:
python/trunk/Doc/lib/libstringio.tex
python/trunk/Lib/test/test_StringIO.py
python/trunk/Misc/NEWS
python/trunk/Modules/cStringIO.c
Log:
Revert the fix for #1548891, it broke backwards compatibility with arbitrary read buffers.
Fixes #1730114.
Modified: python/trunk/Doc/lib/libstringio.tex
==============================================================================
--- python/trunk/Doc/lib/libstringio.tex (original)
+++ python/trunk/Doc/lib/libstringio.tex Wed Aug 8 15:03:41 2007
@@ -78,6 +78,10 @@
module, those provided by this module are not able to accept Unicode
strings that cannot be encoded as plain \ASCII{} strings.
+Calling \function{StringIO()} with a Unicode string parameter populates
+the object with the buffer representation of the Unicode string, instead of
+encoding the string.
+
Another difference from the \refmodule{StringIO} module is that calling
\function{StringIO()} with a string parameter creates a read-only object.
Unlike an object created without a string parameter, it does not have
Modified: python/trunk/Lib/test/test_StringIO.py
==============================================================================
--- python/trunk/Lib/test/test_StringIO.py (original)
+++ python/trunk/Lib/test/test_StringIO.py Wed Aug 8 15:03:41 2007
@@ -121,28 +121,6 @@
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 Wed Aug 8 15:03:41 2007
@@ -782,10 +782,6 @@
- Patch #1576166: Support os.utime for directories on Windows NT+.
-- 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 Wed Aug 8 15:03:41 2007
@@ -673,8 +673,11 @@
char *buf;
Py_ssize_t size;
- if (PyObject_AsCharBuffer(s, (const char **)&buf, &size) != 0)
- return NULL;
+ if (PyObject_AsReadBuffer(s, (const char **)&buf, &size)) {
+ PyErr_Format(PyExc_TypeError, "expected read buffer, %.200s found",
+ s->ob_type->tp_name);
+ return NULL;
+ }
self = PyObject_New(Iobject, &Itype);
if (!self) return NULL;
More information about the Python-checkins
mailing list