Skip to content

Commit a0c90b3

Browse files
miss-islingtonzwareculler
authored
[3.12] gh-124378: Update test_ttk for Tcl/Tk 8.6.15 (GH-124545)
(cherry picked from commit fb6bd31) Co-authored-by: Zachary Ware <[email protected]> Co-authored-by: Marc Culler <[email protected]>
1 parent 7c9db46 commit a0c90b3

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

Lib/test/test_ttk/test_widgets.py

+15-2
Original file line numberDiff line numberDiff line change
@@ -963,8 +963,7 @@ def create(self, **kwargs):
963963
return ttk.Scrollbar(self.root, **kwargs)
964964

965965

966-
@add_standard_options(PixelSizeTests if tk_version >= (8, 7) else IntegerSizeTests,
967-
StandardTtkOptionsTests)
966+
@add_standard_options(StandardTtkOptionsTests)
968967
class NotebookTest(AbstractWidgetTest, unittest.TestCase):
969968
OPTIONS = (
970969
'class', 'cursor', 'height', 'padding', 'style', 'takefocus', 'width',
@@ -983,6 +982,20 @@ def setUp(self):
983982
def create(self, **kwargs):
984983
return ttk.Notebook(self.root, **kwargs)
985984

985+
def test_configure_height(self):
986+
widget = self.create()
987+
if get_tk_patchlevel(self.root) < (8, 6, 15):
988+
self.checkIntegerParam(widget, 'height', 402, -402, 0)
989+
else:
990+
self.checkPixelsParam(widget, 'height', '10c', 402, -402, 0, conv=False)
991+
992+
def test_configure_width(self):
993+
widget = self.create()
994+
if get_tk_patchlevel(self.root) < (8, 6, 15):
995+
self.checkIntegerParam(widget, 'width', 402, -402, 0)
996+
else:
997+
self.checkPixelsParam(widget, 'width', '10c', 402, -402, 0, conv=False)
998+
986999
def test_tab_identifiers(self):
9871000
self.nb.forget(0)
9881001
self.nb.hide(self.child2)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Updated ``test_ttk`` to pass with Tcl/Tk 8.6.15.

0 commit comments

Comments
 (0)