diff options
| -rw-r--r-- | Lib/tkinter/test/support.py | 14 | ||||
| -rw-r--r-- | Lib/tkinter/test/test_tkinter/test_widgets.py | 4 |
2 files changed, 14 insertions, 4 deletions
diff --git a/Lib/tkinter/test/support.py b/Lib/tkinter/test/support.py index dd155fad0f..0d9a65a5cc 100644 --- a/Lib/tkinter/test/support.py +++ b/Lib/tkinter/test/support.py @@ -1,3 +1,4 @@ +import functools import re import tkinter import unittest @@ -54,9 +55,20 @@ import _tkinter tcl_version = tuple(map(int, _tkinter.TCL_VERSION.split('.'))) def requires_tcl(*version): - return unittest.skipUnless(tcl_version >= version, + if len(version) <= 2: + return unittest.skipUnless(tcl_version >= version, 'requires Tcl version >= ' + '.'.join(map(str, version))) + def deco(test): + @functools.wraps(test) + def newtest(self): + if get_tk_patchlevel() < (8, 6, 5): + self.skipTest('requires Tcl version >= ' + + '.'.join(map(str, get_tk_patchlevel()))) + test(self) + return newtest + return deco + _tk_patchlevel = None def get_tk_patchlevel(): global _tk_patchlevel diff --git a/Lib/tkinter/test/test_tkinter/test_widgets.py b/Lib/tkinter/test/test_tkinter/test_widgets.py index cd2a380793..e4c9d337ba 100644 --- a/Lib/tkinter/test/test_tkinter/test_widgets.py +++ b/Lib/tkinter/test/test_tkinter/test_widgets.py @@ -717,9 +717,7 @@ class ListboxTest(AbstractWidgetTest, unittest.TestCase): self.checkEnumParam(widget, 'activestyle', 'dotbox', 'none', 'underline') - @requires_tcl(8, 6, 5) - def test_justify(self): - AbstractWidgetTest.test_justify(self) + test_justify = requires_tcl(8, 6, 5)(StandardOptionsTests.test_justify) def test_listvariable(self): widget = self.create() |