mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-02 06:57:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Marc-Andre Lemburg:

Browse source 
Added special case to unicode(): when being passed a
Unicode object as first argument, return the object as-is.
Raises an exception when given a Unicode object *and* an
encoding name.
This commit is contained in:
Guido van Rossum 2000-04-11 15:38:23 +00:00
parent a3277139f1
commit 3afba7644b
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Python/bltinmodule.c
View file

@ -165,15 +165,28 @@ builtin_unicode(self, args)
PyObject *self;
PyObject *args;
{
char *s;
PyObject *v;
const void *buffer;
int len;
char *encoding = NULL;
char *errors = NULL;
if ( !PyArg_ParseTuple(args, "s#|ss:unicode", &s, &len,
&encoding, &errors) )
if ( !PyArg_ParseTuple(args, "O|ss:unicode", &v, &encoding, &errors) )
return NULL;
return PyUnicode_Decode(s, len, encoding, errors);
/* 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);
}
static char unicode_doc[] =