|
4 | 4 | import os
|
5 | 5 | from test.support import requires
|
6 | 6 |
|
7 |
| -from tkinter.test.support import (requires_tcl, |
| 7 | +from tkinter.test.support import (requires_tk, |
8 | 8 | get_tk_patchlevel, widget_eq,
|
9 | 9 | AbstractDefaultRootTest)
|
10 | 10 | from tkinter.test.widget_tests import (
|
@@ -614,7 +614,7 @@ def test_configure_inactiveselectbackground(self):
|
614 | 614 | widget = self.create()
|
615 | 615 | self.checkColorParam(widget, 'inactiveselectbackground')
|
616 | 616 |
|
617 |
| - @requires_tcl(8, 6) |
| 617 | + @requires_tk(8, 6) |
618 | 618 | def test_configure_insertunfocussed(self):
|
619 | 619 | widget = self.create()
|
620 | 620 | self.checkEnumParam(widget, 'insertunfocussed',
|
@@ -919,7 +919,7 @@ def test_coords(self):
|
919 | 919 | for i in range(4):
|
920 | 920 | self.assertIsInstance(coords[i], float)
|
921 | 921 |
|
922 |
| - @requires_tcl(8, 6) |
| 922 | + @requires_tk(8, 6) |
923 | 923 | def test_moveto(self):
|
924 | 924 | widget = self.create()
|
925 | 925 | i1 = widget.create_rectangle(1, 1, 20, 20, tags='group')
|
@@ -964,7 +964,7 @@ def test_configure_activestyle(self):
|
964 | 964 | self.checkEnumParam(widget, 'activestyle',
|
965 | 965 | 'dotbox', 'none', 'underline')
|
966 | 966 |
|
967 |
| - test_configure_justify = requires_tcl(8, 6, 5)(StandardOptionsTests.test_configure_justify) |
| 967 | + test_configure_justify = requires_tk(8, 6, 5)(StandardOptionsTests.test_configure_justify) |
968 | 968 |
|
969 | 969 | def test_configure_listvariable(self):
|
970 | 970 | widget = self.create()
|
@@ -1103,7 +1103,7 @@ def test_configure_digits(self):
|
1103 | 1103 |
|
1104 | 1104 | def test_configure_from(self):
|
1105 | 1105 | widget = self.create()
|
1106 |
| - conv = float if get_tk_patchlevel() >= (8, 6, 10) else float_round |
| 1106 | + conv = float if get_tk_patchlevel(self.root) >= (8, 6, 10) else float_round |
1107 | 1107 | self.checkFloatParam(widget, 'from', 100, 14.9, 15.1, conv=conv)
|
1108 | 1108 |
|
1109 | 1109 | def test_configure_label(self):
|
@@ -1230,19 +1230,19 @@ def test_configure_opaqueresize(self):
|
1230 | 1230 | widget = self.create()
|
1231 | 1231 | self.checkBooleanParam(widget, 'opaqueresize')
|
1232 | 1232 |
|
1233 |
| - @requires_tcl(8, 6, 5) |
| 1233 | + @requires_tk(8, 6, 5) |
1234 | 1234 | def test_configure_proxybackground(self):
|
1235 | 1235 | widget = self.create()
|
1236 | 1236 | self.checkColorParam(widget, 'proxybackground')
|
1237 | 1237 |
|
1238 |
| - @requires_tcl(8, 6, 5) |
| 1238 | + @requires_tk(8, 6, 5) |
1239 | 1239 | def test_configure_proxyborderwidth(self):
|
1240 | 1240 | widget = self.create()
|
1241 | 1241 | self.checkPixelsParam(widget, 'proxyborderwidth',
|
1242 | 1242 | 0, 1.3, 2.9, 6, -2, '10p',
|
1243 | 1243 | conv=False)
|
1244 | 1244 |
|
1245 |
| - @requires_tcl(8, 6, 5) |
| 1245 | + @requires_tk(8, 6, 5) |
1246 | 1246 | def test_configure_proxyrelief(self):
|
1247 | 1247 | widget = self.create()
|
1248 | 1248 | self.checkReliefParam(widget, 'proxyrelief')
|
|
0 commit comments