|
4 | 4 | import os
|
5 | 5 | from test.support import requires
|
6 | 6 |
|
7 |
| -from test.test_tkinter.support import (requires_tcl, |
| 7 | +from test.test_tkinter.support import (requires_tk, |
8 | 8 | get_tk_patchlevel, widget_eq,
|
9 | 9 | AbstractDefaultRootTest)
|
10 | 10 | from test.test_tkinter.widget_tests import (
|
@@ -613,7 +613,7 @@ def test_configure_inactiveselectbackground(self):
|
613 | 613 | widget = self.create()
|
614 | 614 | self.checkColorParam(widget, 'inactiveselectbackground')
|
615 | 615 |
|
616 |
| - @requires_tcl(8, 6) |
| 616 | + @requires_tk(8, 6) |
617 | 617 | def test_configure_insertunfocussed(self):
|
618 | 618 | widget = self.create()
|
619 | 619 | self.checkEnumParam(widget, 'insertunfocussed',
|
@@ -924,7 +924,7 @@ def test_coords(self):
|
924 | 924 | for i in range(4):
|
925 | 925 | self.assertIsInstance(coords[i], float)
|
926 | 926 |
|
927 |
| - @requires_tcl(8, 6) |
| 927 | + @requires_tk(8, 6) |
928 | 928 | def test_moveto(self):
|
929 | 929 | widget = self.create()
|
930 | 930 | i1 = widget.create_rectangle(1, 1, 20, 20, tags='group')
|
@@ -969,7 +969,7 @@ def test_configure_activestyle(self):
|
969 | 969 | self.checkEnumParam(widget, 'activestyle',
|
970 | 970 | 'dotbox', 'none', 'underline')
|
971 | 971 |
|
972 |
| - test_configure_justify = requires_tcl(8, 6, 5)(StandardOptionsTests.test_configure_justify) |
| 972 | + test_configure_justify = requires_tk(8, 6, 5)(StandardOptionsTests.test_configure_justify) |
973 | 973 |
|
974 | 974 | def test_configure_listvariable(self):
|
975 | 975 | widget = self.create()
|
@@ -1108,7 +1108,7 @@ def test_configure_digits(self):
|
1108 | 1108 |
|
1109 | 1109 | def test_configure_from(self):
|
1110 | 1110 | widget = self.create()
|
1111 |
| - conv = float if get_tk_patchlevel() >= (8, 6, 10) else float_round |
| 1111 | + conv = float if get_tk_patchlevel(self.root) >= (8, 6, 10) else float_round |
1112 | 1112 | self.checkFloatParam(widget, 'from', 100, 14.9, 15.1, conv=conv)
|
1113 | 1113 |
|
1114 | 1114 | def test_configure_label(self):
|
@@ -1235,19 +1235,19 @@ def test_configure_opaqueresize(self):
|
1235 | 1235 | widget = self.create()
|
1236 | 1236 | self.checkBooleanParam(widget, 'opaqueresize')
|
1237 | 1237 |
|
1238 |
| - @requires_tcl(8, 6, 5) |
| 1238 | + @requires_tk(8, 6, 5) |
1239 | 1239 | def test_configure_proxybackground(self):
|
1240 | 1240 | widget = self.create()
|
1241 | 1241 | self.checkColorParam(widget, 'proxybackground')
|
1242 | 1242 |
|
1243 |
| - @requires_tcl(8, 6, 5) |
| 1243 | + @requires_tk(8, 6, 5) |
1244 | 1244 | def test_configure_proxyborderwidth(self):
|
1245 | 1245 | widget = self.create()
|
1246 | 1246 | self.checkPixelsParam(widget, 'proxyborderwidth',
|
1247 | 1247 | 0, 1.3, 2.9, 6, -2, '10p',
|
1248 | 1248 | conv=False)
|
1249 | 1249 |
|
1250 |
| - @requires_tcl(8, 6, 5) |
| 1250 | + @requires_tk(8, 6, 5) |
1251 | 1251 | def test_configure_proxyrelief(self):
|
1252 | 1252 | widget = self.create()
|
1253 | 1253 | self.checkReliefParam(widget, 'proxyrelief')
|
|
0 commit comments