From c4051a8e34b2ab558b42889e9592b3acaeecc95a Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Mon, 4 Nov 2013 22:10:35 +0200 Subject: [PATCH] Issue #19085: Fix Tkinter tests on Tk 8.5 with patchlevel < 8.5.12. --- Lib/lib-tk/test/widget_tests.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Lib/lib-tk/test/widget_tests.py b/Lib/lib-tk/test/widget_tests.py index 7402d91f2d..c60673cc2d 100644 --- a/Lib/lib-tk/test/widget_tests.py +++ b/Lib/lib-tk/test/widget_tests.py @@ -11,10 +11,22 @@ noconv_meth = noconv and staticmethod(noconv) def int_round(x): return int(round(x)) +pixels_round = int_round +if tcl_version[:2] == (8, 5): + # Issue #19085: Workaround a bug in Tk + # http://core.tcl.tk/tk/info/3497848 + root = setup_master() + patchlevel = root.call('info', 'patchlevel') + patchlevel = tuple(map(int, patchlevel.split('.'))) + if patchlevel < (8, 5, 12): + pixels_round = int + del root + + _sentinel = object() class AbstractWidgetTest(object): - _conv_pixels = staticmethod(int_round) + _conv_pixels = staticmethod(pixels_round) _conv_pad_pixels = None wantobjects = True -- 2.50.1