mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-30 13:24:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed unicode() to use the new API PyUnicode_FromEncodedObject().

Browse Source 
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).
This commit is contained in:
Marc-André Lemburg 2000-07-07 13:48:25 +00:00
parent 5a5c81a0e9
commit 1b1bcc9935
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Python/bltinmodule.c
View File

@ -155,20 +155,7 @@ builtin_unicode(self, args)
if ( !PyArg_ParseTuple(args, "O|ss:unicode", &v, &encoding, &errors) ) if ( !PyArg_ParseTuple(args, "O|ss:unicode", &v, &encoding, &errors) )
return NULL; return NULL;
/* Special case: Unicode will stay Unicode */ return PyUnicode_FromEncodedObject(v, encoding, errors);
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);
} }
static char unicode_doc[] = static char unicode_doc[] =