summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorZachary Ware <zach@python.org>2024-09-25 20:16:32 (GMT)
committerGitHub <noreply@github.com>2024-09-25 20:16:32 (GMT)
commitfb6bd31cb74d2f7e7b525ee4fe9f45475fc94ce9 (patch)
tree150fb9e5130328989bf856a002e5beaa07177870 /Lib
parentd6954b6421aa34afd280df9c44ded21a2348a6ea (diff)
downloadcpython-fb6bd31cb74d2f7e7b525ee4fe9f45475fc94ce9.zip
cpython-fb6bd31cb74d2f7e7b525ee4fe9f45475fc94ce9.tar.gz
cpython-fb6bd31cb74d2f7e7b525ee4fe9f45475fc94ce9.tar.bz2
gh-124378: Update test_ttk for Tcl/Tk 8.6.15 (GH-124542)
Co-authored-by: Marc Culler <culler@users.noreply.github.com>
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_ttk/test_widgets.py17
1 files changed, 15 insertions, 2 deletions
diff --git a/Lib/test/test_ttk/test_widgets.py b/Lib/test/test_ttk/test_widgets.py
index cb210b7..88740b1 100644
--- a/Lib/test/test_ttk/test_widgets.py
+++ b/Lib/test/test_ttk/test_widgets.py
@@ -963,8 +963,7 @@ class ScrollbarTest(AbstractWidgetTest, unittest.TestCase):
return ttk.Scrollbar(self.root, **kwargs)
-@add_standard_options(PixelSizeTests if tk_version >= (8, 7) else IntegerSizeTests,
- StandardTtkOptionsTests)
+@add_standard_options(StandardTtkOptionsTests)
class NotebookTest(AbstractWidgetTest, unittest.TestCase):
OPTIONS = (
'class', 'cursor', 'height', 'padding', 'style', 'takefocus', 'width',
@@ -983,6 +982,20 @@ class NotebookTest(AbstractWidgetTest, unittest.TestCase):
def create(self, **kwargs):
return ttk.Notebook(self.root, **kwargs)
+ def test_configure_height(self):
+ widget = self.create()
+ if get_tk_patchlevel(self.root) < (8, 6, 15):
+ self.checkIntegerParam(widget, 'height', 402, -402, 0)
+ else:
+ self.checkPixelsParam(widget, 'height', '10c', 402, -402, 0, conv=False)
+
+ def test_configure_width(self):
+ widget = self.create()
+ if get_tk_patchlevel(self.root) < (8, 6, 15):
+ self.checkIntegerParam(widget, 'width', 402, -402, 0)
+ else:
+ self.checkPixelsParam(widget, 'width', '10c', 402, -402, 0, conv=False)
+
def test_tab_identifiers(self):
self.nb.forget(0)
self.nb.hide(self.child2)