diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2013-11-02 15:27:59 (GMT) |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2013-11-02 15:27:59 (GMT) |
commit | 4a21726fe6c0c98f155433569cce6d101c36c034 (patch) | |
tree | 87a8a94f175827ba511ebd517c51c51e8a789e3f /Lib/lib-tk/test/widget_tests.py | |
parent | 090b6b1baf0f976cea93d5a697d26e09ea855b38 (diff) | |
download | cpython-4a21726fe6c0c98f155433569cce6d101c36c034.zip cpython-4a21726fe6c0c98f155433569cce6d101c36c034.tar.gz cpython-4a21726fe6c0c98f155433569cce6d101c36c034.tar.bz2 |
Issue #19085: Fix Tkinter tests with Tcl/Tk 8.4.
Diffstat (limited to 'Lib/lib-tk/test/widget_tests.py')
-rw-r--r-- | Lib/lib-tk/test/widget_tests.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/lib-tk/test/widget_tests.py b/Lib/lib-tk/test/widget_tests.py index 3e195cc..a4fafff 100644 --- a/Lib/lib-tk/test/widget_tests.py +++ b/Lib/lib-tk/test/widget_tests.py @@ -6,6 +6,7 @@ from test_ttk.support import tcl_version, requires_tcl, pixels_conv, tcl_obj_eq noconv = str if tcl_version < (8, 5) else False +noconv_meth = noconv and staticmethod(noconv) def int_round(x): return int(round(x)) @@ -13,7 +14,7 @@ def int_round(x): _sentinel = object() class AbstractWidgetTest(object): - _conv_pixels = staticmethod(int_round) if tcl_version[:2] != (8, 5) else int + _conv_pixels = staticmethod(int_round if tcl_version[:2] != (8, 5) else int) _conv_pad_pixels = None wantobjects = True |