From: Serhiy Storchaka <storchaka@gmail.com>
Date: Mon, 4 Nov 2013 20:11:12 +0000 (+0200)
Subject: Issue #19085: Fix Tkinter tests on Tk 8.5 with patchlevel < 8.5.12.
X-Git-Tag: v3.4.0b1~396^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d8599ce0cc6b7ec2b7e1c43fc7f59b103ee7fe9;p=thirdparty%2FPython%2Fcpython.git

Issue #19085: Fix Tkinter tests on Tk 8.5 with patchlevel < 8.5.12.
---

diff --git a/Lib/tkinter/test/widget_tests.py b/Lib/tkinter/test/widget_tests.py
index 83db28b8afe4..28cc98617906 100644
--- a/Lib/tkinter/test/widget_tests.py
+++ b/Lib/tkinter/test/widget_tests.py
@@ -8,10 +8,22 @@ from tkinter.test.support import (tcl_version, requires_tcl, pixels_conv,
 
 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