From ae21df59c372dd73307b3cb7178567a930d478c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lemburg?= Date: Thu, 26 Jul 2001 16:29:25 +0000 Subject: Undoing the UCS-4 patch addition which caused unichr() to return surrogates for Unicode code points outside range(0x10000) on narrow Python builds. --- Python/bltinmodule.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index fcc7d17..6eb6aca 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -313,11 +313,21 @@ builtin_unichr(PyObject *self, PyObject *args) 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)"); + "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 */ -- cgit v0.12