From: Georg Brandl <georg@python.org> Date: Fri, 3 Dec 2010 07:54:09 +0000 (+0000) Subject: Remove redundant check for PyBytes in unicode_encode. X-Git-Tag: v3.2b1~104 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b9406b08aad04c1f92d7a2ab03c8a42c3afb8be;p=python Remove redundant check for PyBytes in unicode_encode. --- diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index fd508825ff..f66773e26a 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -7424,27 +7424,11 @@ unicode_encode(PyUnicodeObject *self, PyObject *args, PyObject *kwargs) static char *kwlist[] = {"encoding", "errors", 0}; char *encoding = NULL; char *errors = NULL; - PyObject *v; if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|ss:encode", kwlist, &encoding, &errors)) return NULL; - v = PyUnicode_AsEncodedString((PyObject *)self, encoding, errors); - if (v == NULL) - goto onError; - /* XXX this check is redundant */ - if (!PyBytes_Check(v)) { - PyErr_Format(PyExc_TypeError, - "encoder did not return a bytes object " - "(type=%.400s)", - Py_TYPE(v)->tp_name); - Py_DECREF(v); - return NULL; - } - return v; - - onError: - return NULL; + return PyUnicode_AsEncodedString((PyObject *)self, encoding, errors); } PyDoc_STRVAR(transform__doc__,