]> granicus.if.org Git - python/commitdiff
Fix test_insertwidth Tkinter tests on Tk 8.5 with patchlevel >= 8.5.12 (issue #19085).
authorSerhiy Storchaka <storchaka@gmail.com>
Tue, 5 Nov 2013 19:05:10 +0000 (21:05 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Tue, 5 Nov 2013 19:05:10 +0000 (21:05 +0200)
Lib/tkinter/test/test_tkinter/test_widgets.py

index 8a768edfa89aec62d7e6d4780084689e025ededb..32b1e5da369ce8b3f7ae16d84176fc2d1102540f 100644 (file)
@@ -332,12 +332,12 @@ class EntryTest(AbstractWidgetTest, unittest.TestCase):
     def test_insertwidth(self):
         widget = self.create()
         self.checkPixelsParam(widget, 'insertwidth', 1.3, 3.6, '10p')
-        if tcl_version[:2] == (8, 5):
-            self.checkParam(widget, 'insertwidth', 0.9, expected=2)
-        else:
-            self.checkParam(widget, 'insertwidth', 0.9, expected=1)
         self.checkParam(widget, 'insertwidth', 0.1, expected=2)
         self.checkParam(widget, 'insertwidth', -2, expected=2)
+        if pixels_round(0.9) <= 0:
+            self.checkParam(widget, 'insertwidth', 0.9, expected=2)
+        else:
+            self.checkParam(widget, 'insertwidth', 0.9)
 
     def test_invalidcommand(self):
         widget = self.create()