From ff8f70701e969abef6c1fc64718016d9c68763f2 Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Tue, 23 May 2023 01:02:45 -0400 Subject: [PATCH 1/2] gh-104497: Make tkinter test pass with tk 8.7 For test_widgets.MenuTest.test_configure_type, the options in the error message change to alphabetical order. --- Lib/test/test_tkinter/test_widgets.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_tkinter/test_widgets.py b/Lib/test/test_tkinter/test_widgets.py index b45245162f2446..280949e50cf582 100644 --- a/Lib/test/test_tkinter/test_widgets.py +++ b/Lib/test/test_tkinter/test_widgets.py @@ -1402,10 +1402,15 @@ def test_configure_title(self): def test_configure_type(self): widget = self.create() + r = tkinter.Tk() + tkver = r.getvar('tk_version') + r.destroy() + opts = ('normal, tearoff, or menubar' if tkver < '8.7' else + 'menubar, normal, or tearoff') self.checkEnumParam( widget, 'type', 'normal', 'tearoff', 'menubar', - errmsg='bad type "{}": must be normal, tearoff, or menubar', + errmsg='bad type "{}": must be ' + opts, ) def test_entryconfigure(self): From ac16189fb6478ba74d1193309ba9b404f317624b Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Sat, 27 May 2023 15:01:06 -0400 Subject: [PATCH 2/2] Update Lib/test/test_tkinter/test_widgets.py Co-authored-by: Serhiy Storchaka --- Lib/test/test_tkinter/test_widgets.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_tkinter/test_widgets.py b/Lib/test/test_tkinter/test_widgets.py index 280949e50cf582..59f8814c50fee7 100644 --- a/Lib/test/test_tkinter/test_widgets.py +++ b/Lib/test/test_tkinter/test_widgets.py @@ -1402,10 +1402,8 @@ def test_configure_title(self): def test_configure_type(self): widget = self.create() - r = tkinter.Tk() - tkver = r.getvar('tk_version') - r.destroy() - opts = ('normal, tearoff, or menubar' if tkver < '8.7' else + opts = ('normal, tearoff, or menubar' + if widget.info_patchlevel() < (8, 7) else 'menubar, normal, or tearoff') self.checkEnumParam( widget, 'type',