Repository navigation
Commit 832bc0b
Since gh-153513, _tkinter returns int, float and pixel objects for the
corresponding Tcl object types on all Tk versions. The tests for the
Text "tabs" and ttk "padding" options therefore no longer need to expect
string tuples on Tk older than 8.6.14.
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
1 parent dd2faeb commit 832bc0b
2 files changed
Lines changed: 6 additions & 14 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -915,9 +915,7 @@ def test_configure_tabs(self): | |||
| 915 | 915 | widget = self.create() | |
| 916 | 916 | self.checkParam(widget, 'tabs', (10.2, 20.7, '1i', '2i')) | |
| 917 | 917 | self.checkParam(widget, 'tabs', '10.2 20.7 1i 2i', | |
| 918 | - expected=(10.2, 20.7, '1i', '2i') | ||
| 919 | - if get_tk_patchlevel(self.root) >= (8, 6, 14) | ||
| 920 | - else ('10.2', '20.7', '1i', '2i')) | ||
| 918 | + expected=(10.2, 20.7, '1i', '2i')) | ||
| 921 | 919 | self.checkParam(widget, 'tabs', '2c left 4c 6c center', | |
| 922 | 920 | expected=('2c', 'left', '4c', '6c', 'center')) | |
| 923 | 921 | self.checkInvalidParam(widget, 'tabs', 'spam', | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -29,20 +29,14 @@ def test_configure_class(self): | |||
| 29 | 29 | ||
| 30 | 30 | def test_configure_padding(self): | |
| 31 | 31 | widget = self.create() | |
| 32 | - if get_tk_patchlevel(self.root) < (8, 6, 14): | ||
| 33 | - def padding_conv(value): | ||
| 34 | - self.assertIsInstance(value, tuple) | ||
| 35 | - return tuple(map(str, value)) | ||
| 36 | - else: | ||
| 37 | - padding_conv = None | ||
| 38 | - self.checkParam(widget, 'padding', 0, expected=(0,), conv=padding_conv) | ||
| 39 | - self.checkParam(widget, 'padding', 5, expected=(5,), conv=padding_conv) | ||
| 32 | + self.checkParam(widget, 'padding', 0, expected=(0,)) | ||
| 33 | + self.checkParam(widget, 'padding', 5, expected=(5,)) | ||
| 40 | 34 | self.checkParam(widget, 'padding', (5, 6), | |
| 41 | - expected=(5, 6), conv=padding_conv) | ||
| 35 | + expected=(5, 6)) | ||
| 42 | 36 | self.checkParam(widget, 'padding', (5, 6, 7), | |
| 43 | - expected=(5, 6, 7), conv=padding_conv) | ||
| 37 | + expected=(5, 6, 7)) | ||
| 44 | 38 | self.checkParam(widget, 'padding', (5, 6, 7, 8), | |
| 45 | - expected=(5, 6, 7, 8), conv=padding_conv) | ||
| 39 | + expected=(5, 6, 7, 8)) | ||
| 46 | 40 | self.checkParam(widget, 'padding', ('5p', '6p', '7p', '8p')) | |
| 47 | 41 | self.checkParam(widget, 'padding', (), expected='') | |
| 48 | 42 | ||
0 commit comments