raise TypeError when bad argument passed to cStringIO.StringIO

This commit is contained in:
Jeremy Hylton 2000-04-12 22:04:01 +00:00
parent 394b54d01a
commit 127b2ef2d5
1 changed files with 10 additions and 4 deletions

View File

@ -579,8 +579,13 @@ newIobject(PyObject *s) {
char *buf;
int size;
UNLESS(buf=PyString_AsString(s)) return NULL;
UNLESS(-1 != (size=PyString_Size(s))) return NULL;
if (!PyString_Check(s)) {
PyErr_Format(PyExc_TypeError, "expected string, %.200s found",
s->ob_type->tp_name);
return NULL;
}
buf = PyString_AS_STRING(s);
size = PyString_GET_SIZE(s);
UNLESS(self = PyObject_NEW(Iobject, &Itype)) return NULL;
Py_INCREF(s);
self->buf=buf;
@ -603,7 +608,8 @@ static PyObject *
IO_StringIO(PyObject *self, PyObject *args) {
PyObject *s=0;
UNLESS(PyArg_ParseTuple(args, "|O:StringIO", &s)) return NULL;
if (!PyArg_ParseTuple(args, "|O:StringIO", &s))
return NULL;
if(s) return newIobject(s);
return newOobject(128);
}