From 1b1bcc993579e64d751dc75bc8521adb9e94c732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lemburg?= Date: Fri, 7 Jul 2000 13:48:25 +0000 Subject: [PATCH] Fixed unicode() to use the new API PyUnicode_FromEncodedObject(). This adds support for instance to the constructor (instances have to define __str__ and can return Unicode objects via that hook; string return values are decoded into Unicode using the current default encoding). --- Python/bltinmodule.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 82867e0f439..8e2720b93c2 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -155,20 +155,7 @@ builtin_unicode(self, args) if ( !PyArg_ParseTuple(args, "O|ss:unicode", &v, &encoding, &errors) ) return NULL; - /* Special case: Unicode will stay Unicode */ - if (PyUnicode_Check(v)) { - if (encoding) { - PyErr_SetString(PyExc_TypeError, - "unicode() does not support decoding of Unicode objects"); - return NULL; - } - Py_INCREF(v); - return v; - } - /* Read raw data and decode it */ - if (PyObject_AsReadBuffer(v, &buffer, &len)) - return NULL; - return PyUnicode_Decode((const char *)buffer, len, encoding, errors); + return PyUnicode_FromEncodedObject(v, encoding, errors); } static char unicode_doc[] =