commit bd28ca65d67afa88e2a702157eeeab0514cba9bb
author Martin v. Löwis <martin@v.loewis.de> Sat Jul 28 07:01:43 2007 +0000
committer Martin v. Löwis <martin@v.loewis.de> Sat Jul 28 07:01:43 2007 +0000
tree 441c52326a76592275802e5b12fce07fa88ef49d
parent 0e258c5ea5c69e60eb581f3f186022a8400b8d79

Bug #1704793: Raise KeyError if unicodedata.lookup cannot
represent the result in a single character.

Modules/unicodedata.c

diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c
index a30d30c..1a32b64 100644
--- a/Modules/unicodedata.c
+++ b/Modules/unicodedata.c
@@ -1102,8 +1102,18 @@
         return NULL;
     }
 
+#ifndef Py_UNICODE_WIDE
+    if (code >= 0x10000) {
+        /* Raise KeyError for compatibility; the possibly more
+           correct ValueError was not documented as a possible
+           exception for 2.5.x and earlier. */
+        PyErr_Format(PyExc_KeyError, "result %d larger than sys.maxunicode",
+                     code);
+        return NULL;
+    }
+#endif
     str[0] = (Py_UNICODE) code;
-    return PyUnicode_FromUnicode(str, 1);
+    return PyUnicode_FromUnicode(str, 1);    
 }
 
 /* XXX Add doc strings. */