From 59f5dee3d66fcac58a21c4eb7bc1d1767d38ae6f Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Mon, 18 Feb 2013 13:01:52 +0200
Subject: [PATCH] Issue #13153: Tkinter functions now raise TclError instead of
 ValueError when a string argument contains non-BMP character.

---
 Misc/NEWS          | 3 +++
 Modules/_tkinter.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Misc/NEWS b/Misc/NEWS
index 747a3aa154b..51f6f1b78d6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -224,6 +224,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #13153: Tkinter functions now raise TclError instead of ValueError when
+  a string 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 23906dea903..c6a3e388ef3 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -993,7 +993,7 @@ AsObj(PyObject *value)
         for (i = 0; i < size; i++) {
             if (inbuf[i] >= 0x10000) {
                 /* Tcl doesn't do UTF-16, yet. */
-                PyErr_Format(PyExc_ValueError,
+                PyErr_Format(Tkinter_TclError,
                              "character U+%x is above the range "
                              "(U+0000-U+FFFF) allowed by Tcl",
                              inbuf[i]);