diff options
| author | Guido van Rossum <guido@python.org> | 2007-05-04 00:41:39 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-05-04 00:41:39 (GMT) |
| commit | f15a29f975bbdef6de0aa19a19b176d1baf8f5ab (patch) | |
| tree | 60f4f72289129eaa808e05f2b7c7fb7bde077371 /Objects/stringobject.c | |
| parent | bae5cedb8d41edc20bea54b8bff0c7f835de8043 (diff) | |
| download | cpython-f15a29f975bbdef6de0aa19a19b176d1baf8f5ab.zip cpython-f15a29f975bbdef6de0aa19a19b176d1baf8f5ab.tar.gz cpython-f15a29f975bbdef6de0aa19a19b176d1baf8f5ab.tar.bz2 | |
More coding by random modification.
Encoding now return bytes instead of str8.
eval(), exec(), compile() now accept unicode or bytes.
Diffstat (limited to 'Objects/stringobject.c')
| -rw-r--r-- | Objects/stringobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/stringobject.c b/Objects/stringobject.c index f74c5dc..2ebaca8 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -3181,9 +3181,9 @@ string_encode(PyStringObject *self, PyObject *args) v = PyString_AsEncodedObject((PyObject *)self, encoding, errors); if (v == NULL) goto onError; - if (!PyString_Check(v) && !PyUnicode_Check(v)) { + if (!PyBytes_Check(v)) { PyErr_Format(PyExc_TypeError, - "encoder did not return a string/unicode object " + "[str8] encoder did not return a bytes object " "(type=%.400s)", v->ob_type->tp_name); Py_DECREF(v); |