There should be no codecs left that return str8 intead of bytes.

(And if there are, they will now get an error when used.  So fix them!)
This commit is contained in:
Guido van Rossum 2007-08-27 18:20:11 +00:00
parent 700bd92677
commit 35d9428046
1 changed files with 1 additions and 7 deletions

View File

@ -6407,19 +6407,13 @@ unicode_encode(PyUnicodeObject *self, PyObject *args)
char *encoding = NULL;
char *errors = NULL;
PyObject *v;
if (!PyArg_ParseTuple(args, "|ss:encode", &encoding, &errors))
return NULL;
v = PyUnicode_AsEncodedObject((PyObject *)self, encoding, errors);
if (v == NULL)
goto onError;
if (!PyBytes_Check(v)) {
if (PyString_Check(v)) {
/* Old codec, turn it into bytes */
PyObject *b = PyBytes_FromObject(v);
Py_DECREF(v);
return b;
}
PyErr_Format(PyExc_TypeError,
"encoder did not return a bytes object "
"(type=%.400s)",