Issue #13153: Tkinter functions now raise TclError instead of ValueError when

a unicode argument contains non-BMP character.

diff --git a/Misc/NEWS b/Misc/NEWS
index 5924366d953a3e807da4f2a33e4b942cc6c003c9..ef3d053109cdcaacfa40505de6b6b486f9b42577 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -205,6 +205,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #13153: Tkinter functions now raise TclError instead of ValueError when
+  a unicode argument contains non-BMP character.
+
 - Issue #9669: Protect re against infinite loops on zero-width matching in
   non-greedy repeat.  Patch by Matthew Barnett.
 

diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 40c8be2ce7cba028c85c46b0c99bc2dd4be3e889..7872df3bf18e62c0e934c36ec99c51994e4b54e1 100644 (file)
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -987,8 +987,10 @@ AsObj(PyObject *value)
         for (i = 0; i < size; i++) {
             if (inbuf[i] >= 0x10000) {
                 /* Tcl doesn't do UTF-16, yet. */
-                PyErr_SetString(PyExc_ValueError,
-                                "unsupported character");
+                PyErr_Format(Tkinter_TclError,
+                             "character U+%x is above the range "
+                             "(U+0000-U+FFFF) allowed by Tcl",
+                             (int)inbuf[i]);
                 ckfree(FREECAST outbuf);
                 return NULL;
             }