diff -r 79a5fbe2c78f Lib/tkinter/__init__.py --- a/Lib/tkinter/__init__.py Tue Jul 29 19:41:11 2014 -0400 +++ b/Lib/tkinter/__init__.py Wed Jul 30 10:32:42 2014 +0300 @@ -245,7 +245,7 @@ Return the name of the callback. """ cbname = self._master._register(callback) - self._tk.call("trace", "variable", self._name, mode, cbname) + self._tk.call("trace", "add", "variable", self._name, mode, cbname) return cbname trace = trace_variable def trace_vdelete(self, mode, cbname): @@ -254,12 +254,12 @@ MODE is one of "r", "w", "u" for read, write, undefine. CBNAME is the name of the callback returned from trace_variable or trace. """ - self._tk.call("trace", "vdelete", self._name, mode, cbname) + self._tk.call("trace", "remove", "variable", self._name, mode, cbname) self._master.deletecommand(cbname) def trace_vinfo(self): """Return all trace callback information.""" return [self._tk.split(x) for x in self._tk.splitlist( - self._tk.call("trace", "vinfo", self._name))] + self._tk.call("trace", "info", "variable", self._name))] def __eq__(self, other): """Comparison for equality (==). @@ -3789,8 +3789,7 @@ def _test(): root = Tk() text = "This is Tcl/Tk version %s" % TclVersion - if TclVersion >= 8.1: - text += "\nThis should be a cedilla: \xe7" + text += "\nThis should be a cedilla: \xe7" label = Label(root, text=text) label.pack() test = Button(root, text="Click me!", diff -r 79a5fbe2c78f Modules/_tkinter.c --- a/Modules/_tkinter.c Tue Jul 29 19:41:11 2014 -0400 +++ b/Modules/_tkinter.c Wed Jul 30 10:32:42 2014 +0300 @@ -9,8 +9,8 @@ /* TCL/TK VERSION INFO: - Only Tcl/Tk 8.3.1 and later are supported. Older versions are not - supported. Use Python 2.6 or older if you cannot upgrade your + Only Tcl/Tk 8.4 and later are supported. Older versions are not + supported. Use Python 3.4 or older if you cannot upgrade your Tcl/Tk libraries. */ @@ -36,13 +36,6 @@ #define CHECK_SIZE(size, elemsize) \ ((size_t)(size) <= Py_MAX((size_t)INT_MAX, UINT_MAX / (size_t)(elemsize))) -/* Starting with Tcl 8.4, many APIs offer const-correctness. Unfortunately, - making _tkinter correct for this API means to break earlier - versions. USE_COMPAT_CONST allows to make _tkinter work with both 8.4 and - earlier versions. Once Tcl releases before 8.4 don't need to be supported - anymore, this should go. */ -#define USE_COMPAT_CONST - /* If Tcl is compiled for threads, we must also define TCL_THREAD. We define it always; if Tcl is not threaded, the thread functions in Tcl are empty. */ @@ -58,15 +51,8 @@ #include "tkinter.h" -/* For Tcl 8.2 and 8.3, CONST* is not defined (except on Cygwin). */ -#ifndef CONST84_RETURN -#define CONST84_RETURN -#undef CONST -#define CONST -#endif - -#if TK_VERSION_HEX < 0x08030102 -#error "Tk older than 8.3.1 not supported" +#if TK_VERSION_HEX < 0x08040002 +#error "Tk older than 8.4 not supported" #endif #if !(defined(MS_WINDOWS) || defined(__CYGWIN__))