[Python-checkins] [3.12] gh-104497: Make tkinter test pass with tk 8.7 (GH-104789) (#105028)

Sat May 27 17:51:12 EDT 2023

https://github.com/python/cpython/commit/5426ff14765bda6c1bf5a74f8223edc144bc8b1f
commit: 5426ff14765bda6c1bf5a74f8223edc144bc8b1f
branch: 3.12
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: terryjreedy <tjreedy at udel.edu>
date: 2023年05月27日T17:51:05-04:00
summary:
[3.12] gh-104497: Make tkinter test pass with tk 8.7 (GH-104789) (#105028)
For test_widgets.MenuTest.test_configure_type, the options
in the error message change to alphabetical order.
---------
(cherry picked from commit 897e716d03d559a10dd5015ecb501ceb98955f3a)
Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>
Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>
files:
M Lib/test/test_tkinter/test_widgets.py

diff --git a/Lib/test/test_tkinter/test_widgets.py b/Lib/test/test_tkinter/test_widgets.py
index 76cc16e5b977d..34e67c0cbc44a 100644
--- a/Lib/test/test_tkinter/test_widgets.py
+++ b/Lib/test/test_tkinter/test_widgets.py
@@ -1408,10 +1408,13 @@ def test_configure_title(self):
 
 def test_configure_type(self):
 widget = self.create()
+ opts = ('normal, tearoff, or menubar'
+ if widget.info_patchlevel() < (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):
