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

Issue #19085: Fix running test_ttk_textonly on displayless host.

Browse source
This commit is contained in:
Serhiy Storchaka 2013-11-04 23:05:37 +02:00
parent 8d8599ce0c
commit 2028e01313
2 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,8 @@ import os
from test.support import requires 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, widget_eq
from tkinter.test.widget_tests import (add_standard_options, noconv, from tkinter.test.widget_tests import (
add_standard_options, noconv, pixels_round,
AbstractWidgetTest, StandardOptionsTests, IntegerSizeTests, PixelSizeTests) AbstractWidgetTest, StandardOptionsTests, IntegerSizeTests, PixelSizeTests)
requires('gui') requires('gui')
@ -243,7 +244,7 @@ class MenubuttonTest(AbstractLabelTest, unittest.TestCase):
'takefocus', 'text', 'textvariable', 'takefocus', 'text', 'textvariable',
'underline', 'width', 'wraplength', 'underline', 'width', 'wraplength',
) )
_conv_pixels = AbstractWidgetTest._conv_pixels _conv_pixels = staticmethod(pixels_round)
def _create(self, **kwargs): def _create(self, **kwargs):
return tkinter.Menubutton(self.root, **kwargs) return tkinter.Menubutton(self.root, **kwargs)

20
Lib/tkinter/test/widget_tests.py
View file

@ -12,18 +12,24 @@ pixels_round = round
if tcl_version[:2] == (8, 5): if tcl_version[:2] == (8, 5):
# Issue #19085: Workaround a bug in Tk # Issue #19085: Workaround a bug in Tk
# http://core.tcl.tk/tk/info/3497848 # http://core.tcl.tk/tk/info/3497848
root = setup_master() _pixels_round = None
patchlevel = root.call('info', 'patchlevel') def pixels_round(x):
patchlevel = tuple(map(int, patchlevel.split('.'))) global _pixels_round
if patchlevel < (8, 5, 12): if _pixels_round is None:
pixels_round = int root = setup_master()
del root patchlevel = root.call('info', 'patchlevel')
patchlevel = tuple(map(int, patchlevel.split('.')))
if patchlevel < (8, 5, 12):
_pixels_round = int
else:
_pixels_round = int_round
return _pixels_round(x)
_sentinel = object() _sentinel = object()
class AbstractWidgetTest: class AbstractWidgetTest:
_conv_pixels = pixels_round _conv_pixels = staticmethod(pixels_round)
_conv_pad_pixels = None _conv_pad_pixels = None
wantobjects = True wantobjects = True