mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix Tkinter tests on Tk 8.5 with patchlevel < 8.5.11 (issue #19085).

Browse source
This commit is contained in:
Serhiy Storchaka 2013-11-09 21:16:19 +02:00
parent 2915933f4f
commit affb9b255b
3 changed files with 31 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/tkinter/test/test_tkinter/test_widgets.py
View file

@ -3,7 +3,8 @@ import tkinter
import os
from test.support import requires
from tkinter.test.support import tcl_version, requires_tcl, widget_eq
from tkinter.test.support import (tcl_version, requires_tcl,
get_tk_patchlevel, widget_eq)
from tkinter.test.widget_tests import (
add_standard_options, noconv, pixels_round,
AbstractWidgetTest, StandardOptionsTests, IntegerSizeTests, PixelSizeTests)
@ -539,7 +540,7 @@ class TextTest(AbstractWidgetTest, unittest.TestCase):
def test_selectborderwidth(self):
widget = self.create()
self.checkPixelsParam(widget, 'selectborderwidth',
1.3, 2.6, -2, '10p', conv=False,
1.3, 2.6, -2, '10p', conv=noconv,
keep_orig=tcl_version >= (8, 5))
def test_spacing1(self):
@ -580,7 +581,11 @@ class TextTest(AbstractWidgetTest, unittest.TestCase):
def test_tabs(self):
widget = self.create()
self.checkParam(widget, 'tabs', (10.2, 20.7, '1i', '2i'))
if get_tk_patchlevel() < (8, 5, 11):
self.checkParam(widget, 'tabs', (10.2, 20.7, '1i', '2i'),
expected=('10.2', '20.7', '1i', '2i'))
else:
self.checkParam(widget, 'tabs', (10.2, 20.7, '1i', '2i'))
self.checkParam(widget, 'tabs', '10.2 20.7 1i 2i',
expected=('10.2', '20.7', '1i', '2i'))
self.checkParam(widget, 'tabs', '2c left 4c 6c center',