traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #16840. Turn off bignum support in tkinter with with Tcl earlier than 8.5.8 

(tclTomMath.h was broken) and non-final Tcl 8.6.
Removed TK_VERSION_HEX.
This commit is contained in:
Serhiy Storchaka 2015-04-22 10:59:32 +03:00
parent aec0509193 3af7a38c61
commit 71b49dde3a
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/test_tcl.py
View File

@ -131,7 +131,9 @@ class TclTest(unittest.TestCase):
def get_integers(self): def get_integers(self):
integers = (0, 1, -1, 2**31-1, -2**31, 2**31, -2**31-1, 2**63-1, -2**63) integers = (0, 1, -1, 2**31-1, -2**31, 2**31, -2**31-1, 2**63-1, -2**63)
if tcl_version >= (8, 5): # bignum was added in Tcl 8.5 # bignum was added in Tcl 8.5, but its support is able only since 8.5.8
if (get_tk_patchlevel() >= (8, 6, 0, 'final') or
(8, 5, 8) <= get_tk_patchlevel() < (8, 6)):
integers += (2**63, -2**63-1, 2**1000, -2**1000) integers += (2**63, -2**63-1, 2**1000, -2**1000)
return integers return integers

7
Modules/_tkinter.c
View File

@ -52,11 +52,12 @@ Copyright (C) 1994 Steen Lumholt.
#include "tkinter.h" #include "tkinter.h"
#if TK_VERSION_HEX < 0x08040002 #if TK_HEX_VERSION < 0x08040200
#error "Tk older than 8.4 not supported" #error "Tk older than 8.4 not supported"
#endif #endif
#if TK_VERSION_HEX >= 0x08050002 #if TK_HEX_VERSION >= 0x08050208 && TK_HEX_VERSION < 0x08060000 || \
TK_HEX_VERSION >= 0x08060200
#define HAVE_LIBTOMMAMTH #define HAVE_LIBTOMMAMTH
#include <tclTomMath.h> #include <tclTomMath.h>
#endif #endif
@ -1227,7 +1228,7 @@ FromObj(PyObject* tkapp, Tcl_Obj *value)
Tcl_GetCharLength(value)); Tcl_GetCharLength(value));
} }
#if TK_VERSION_HEX >= 0x08050000 #if TK_HEX_VERSION >= 0x08050000
if (app->BooleanType == NULL && if (app->BooleanType == NULL &&
strcmp(value->typePtr->name, "booleanString") == 0) { strcmp(value->typePtr->name, "booleanString") == 0) {
/* booleanString type is not registered in Tcl */ /* booleanString type is not registered in Tcl */

10
Modules/tkinter.h
View File

@ -4,21 +4,21 @@
/* This header is used to share some macros between _tkinter.c and /* This header is used to share some macros between _tkinter.c and
* tkappinit.c. * tkappinit.c.
* Be sure to include tk.h before including this header so * Be sure to include tk.h before including this header so
* TK_VERSION_HEX is properly defined. */ * TK_HEX_VERSION is properly defined. */
/* TK_RELEASE_LEVEL is always one of the following: /* TK_RELEASE_LEVEL is always one of the following:
* TCL_ALPHA_RELEASE 0 * TCL_ALPHA_RELEASE 0
* TCL_BETA_RELEASE 1 * TCL_BETA_RELEASE 1
* TCL_FINAL_RELEASE 2 * TCL_FINAL_RELEASE 2
*/ */
#define TK_VERSION_HEX ((TK_MAJOR_VERSION << 24) | \ #define TK_HEX_VERSION ((TK_MAJOR_VERSION << 24) | \
(TK_MINOR_VERSION << 16) | \ (TK_MINOR_VERSION << 16) | \
(TK_RELEASE_SERIAL << 8) | \ (TK_RELEASE_LEVEL << 8) | \
(TK_RELEASE_LEVEL << 0)) (TK_RELEASE_SERIAL << 0))
/* Protect Tk 8.4.13 and older from a deadlock that happens when trying /* Protect Tk 8.4.13 and older from a deadlock that happens when trying
* to load tk after a failed attempt. */ * to load tk after a failed attempt. */
#if TK_VERSION_HEX < 0x08040e02 #if TK_HEX_VERSION < 0x0804020e
#define TKINTER_PROTECT_LOADTK #define TKINTER_PROTECT_LOADTK
#define TKINTER_LOADTK_ERRMSG \ #define TKINTER_LOADTK_ERRMSG \
"Calling Tk_Init again after a previous call failed might deadlock" "Calling Tk_Init again after a previous call failed might deadlock"