changeset:   86925:fe5a829bd645
parent:      86921:ac1685661b07
parent:      86924:583347b79aa0
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Mon Nov 04 22:11:43 2013 +0200
description:
Issue #19085: Fix Tkinter tests on Tk 8.5 with patchlevel < 8.5.12.


diff -r ac1685661b07 -r fe5a829bd645 Lib/tkinter/test/widget_tests.py
--- a/Lib/tkinter/test/widget_tests.py	Mon Nov 04 23:32:16 2013 +1000
+++ b/Lib/tkinter/test/widget_tests.py	Mon Nov 04 22:11:43 2013 +0200
@@ -8,10 +8,22 @@
 
 noconv = str if tcl_version < (8, 5) else False
 
+pixels_round = 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:
-    _conv_pixels = round
+    _conv_pixels = pixels_round
     _conv_pad_pixels = None
     wantobjects = True