mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Add C API PyUnicode_FromOrdinal() which exposes unichr() at C level.

Browse source 
u'%c' will now raise a ValueError in case the argument is an
integer outside the valid range of Unicode code point ordinals.

Closes SF bug #593581.
This commit is contained in:
Marc-André Lemburg 2002-08-11 12:23:04 +00:00
parent 078151da90
commit cc8764ca9d
5 changed files with 82 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Python/bltinmodule.c
View file

@ -260,44 +260,11 @@ static PyObject *
builtin_unichr(PyObject *self, PyObject *args)
{
long x;
Py_UNICODE s[2];
if (!PyArg_ParseTuple(args, "l:unichr", &x))
return NULL;
#ifdef Py_UNICODE_WIDE
if (x < 0 || x > 0x10ffff) {
PyErr_SetString(PyExc_ValueError,
"unichr() arg not in range(0x110000) "
"(wide Python build)");
return NULL;
}
#else
if (x < 0 || x > 0xffff) {
PyErr_SetString(PyExc_ValueError,
"unichr() arg not in range(0x10000) "
"(narrow Python build)");
return NULL;
}
#endif
if (x <= 0xffff) {
/* UCS-2 character */
s[0] = (Py_UNICODE) x;
return PyUnicode_FromUnicode(s, 1);
}
else {
#ifndef Py_UNICODE_WIDE
/* UCS-4 character. store as two surrogate characters */
x -= 0x10000L;
s[0] = 0xD800 + (Py_UNICODE) (x >> 10);
s[1] = 0xDC00 + (Py_UNICODE) (x & 0x03FF);
return PyUnicode_FromUnicode(s, 2);
#else
s[0] = (Py_UNICODE)x;
return PyUnicode_FromUnicode(s, 1);
#endif
}
return PyUnicode_FromOrdinal(x);
}
PyDoc_STRVAR(unichr_doc,