From: Guido van Rossum <guido@python.org>
Date: Mon, 29 Apr 2002 13:54:48 +0000 (+0000)
Subject: See discussion at SF bug 547537.
X-Git-Tag: v2.3c1~5772
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a883a3d5fdfefdf198bd34f6d07273063bc1f3b5;p=python

See discussion at SF bug 547537.

Unicode objects are currently taken as binary data by the write()
method.  This is not what Unicode users expect, nor what the
StringIO.py code does.  Until somebody adds a way to specify binary or
text mode for cStringIO objects, change the format string to use "t#"
instead of "s#", so that it will request the "text buffer" version.
This will try the default encoding for Unicode objects.

This is *not* a 2.2 bugfix (since it *is* a semantic change).
---

diff --git a/Modules/cStringIO.c b/Modules/cStringIO.c
index 068a835413..1dbec84651 100644
--- a/Modules/cStringIO.c
+++ b/Modules/cStringIO.c
@@ -376,7 +376,7 @@ O_write(Oobject *self, PyObject *args) {
         char *c;
         int l;
 
-        UNLESS (PyArg_ParseTuple(args, "s#:write", &c, &l)) return NULL;
+        UNLESS (PyArg_ParseTuple(args, "t#:write", &c, &l)) return NULL;
 
         if (O_cwrite((PyObject*)self,c,l) < 0) return NULL;