diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2019-10-04 10:09:52 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-04 10:09:52 (GMT) |
| commit | 06cb94bc8419b9a24df6b0d724fcd8e40c6971d6 (patch) | |
| tree | 61dff1fe122eac251b43b7994f7deb40f1b9efcc /Lib/tkinter/test/test_ttk/test_widgets.py | |
| parent | 2290b23dfc9cce71ffc49bfcb6a5a16c570cefae (diff) | |
| download | cpython-06cb94bc8419b9a24df6b0d724fcd8e40c6971d6.zip cpython-06cb94bc8419b9a24df6b0d724fcd8e40c6971d6.tar.gz cpython-06cb94bc8419b9a24df6b0d724fcd8e40c6971d6.tar.bz2 | |
bpo-13153: Use OS native encoding for converting between Python and Tcl. (GH-16545)
On Windows use UTF-16 (or UTF-32 for 32-bit Tcl_UniChar) with the
"surrogatepass" error handler for converting to/from Tcl Unicode objects.
On Linux use UTF-8 with the "surrogateescape" error handler for converting
to/from Tcl String objects.
Converting strings from Tcl to Python and back now never fails
(except MemoryError).
Diffstat (limited to 'Lib/tkinter/test/test_ttk/test_widgets.py')
| -rw-r--r-- | Lib/tkinter/test/test_ttk/test_widgets.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/Lib/tkinter/test/test_ttk/test_widgets.py b/Lib/tkinter/test/test_ttk/test_widgets.py index 69e4b3f..2598bc6 100644 --- a/Lib/tkinter/test/test_ttk/test_widgets.py +++ b/Lib/tkinter/test/test_ttk/test_widgets.py @@ -489,8 +489,7 @@ class ComboboxTest(EntryTest, unittest.TestCase): expected=('mon', 'tue', 'wed', 'thur')) self.checkParam(self.combo, 'values', ('mon', 'tue', 'wed', 'thur')) self.checkParam(self.combo, 'values', (42, 3.14, '', 'any string')) - self.checkParam(self.combo, 'values', '', - expected='' if get_tk_patchlevel() < (8, 5, 10) else ()) + self.checkParam(self.combo, 'values', '') self.combo['values'] = ['a', 1, 'c'] @@ -1245,12 +1244,7 @@ class SpinboxTest(EntryTest, unittest.TestCase): expected=('mon', 'tue', 'wed', 'thur')) self.checkParam(self.spin, 'values', ('mon', 'tue', 'wed', 'thur')) self.checkParam(self.spin, 'values', (42, 3.14, '', 'any string')) - self.checkParam( - self.spin, - 'values', - '', - expected='' if get_tk_patchlevel() < (8, 5, 10) else () - ) + self.checkParam(self.spin, 'values', '') self.spin['values'] = ['a', 1, 'c'] @@ -1308,8 +1302,7 @@ class TreeviewTest(AbstractWidgetTest, unittest.TestCase): self.checkParam(widget, 'columns', 'a b c', expected=('a', 'b', 'c')) self.checkParam(widget, 'columns', ('a', 'b', 'c')) - self.checkParam(widget, 'columns', (), - expected='' if get_tk_patchlevel() < (8, 5, 10) else ()) + self.checkParam(widget, 'columns', '') def test_displaycolumns(self): widget = self.create() |