Force checks to rerun since CLA signing seems hung. (No changes.)

Author: culler

Lib/test/test_tkinter/support.py

@@ -2,18 +2,6 @@
 import re
 import tkinter
 
-messages_v1 = {
-    'no_busy': 'can\'t find busy window.*',
-    'no_font': 'font "{}" doesn\'t exist',
-    'no_image': 'image "{}" doesn\'t exist',
-    }
-
-messages_v2 = {
-    'no_busy': 'cannot find busy window',
-    'no_font': 'font "{}" does not exist',
-    'no_image': 'image "{}" does not exist',
-    }
-
 class AbstractTkTest:
 
     @classmethod

Lib/test/test_tkinter/test_misc.py

@@ -8,11 +8,6 @@
 
 support.requires('gui')
 
-if tk_version < (9,0):
-    from test.test_tkinter.support import messages_v1 as messages
-else:
-    from test.test_tkinter.support import messages_v2 as messages
-
 class MiscTest(AbstractTkTest, unittest.TestCase):
 
     def test_all(self):
@@ -71,9 +66,10 @@ def test_tk_busy(self):
         f.tk_busy_forget()
         self.assertFalse(f.tk_busy_status())
         self.assertFalse(f.tk_busy_current())
-        with self.assertRaisesRegex(TclError, messages['no_busy']):
+        errmsg = r"can(no|')t find busy window.*"
+        with self.assertRaisesRegex(TclError, errmsg):
             f.tk_busy_configure()
-        with self.assertRaisesRegex(TclError, messages['no_busy']):
+        with self.assertRaisesRegex(TclError, errmsg):
             f.tk_busy_forget()
 
     @requires_tk(8, 6, 6)
@@ -92,7 +88,8 @@ def test_tk_busy_with_cursor(self):
         self.assertEqual(f.tk_busy_configure('cursor')[4], 'heart')
 
         f.tk_busy_forget()
-        with self.assertRaisesRegex(TclError, messages["no_busy"]):
+        errmsg = r"can(no|')t find busy window.*"
+        with self.assertRaisesRegex(TclError, errmsg):
             f.tk_busy_cget('cursor')
 
     def test_tk_setPalette(self):

Lib/test/test_tkinter/test_widgets.py

@@ -7,10 +7,7 @@
 from test.test_tkinter.support import (requires_tk, tk_version,
                                   get_tk_patchlevel, widget_eq,
                                   AbstractDefaultRootTest)
-if tk_version < (9, 0):
-    from test.test_tkinter.support import messages_v1 as messages, is_pixel_str
-else:
-    from test.test_tkinter.support import messages_v2 as messages, is_pixel_str
+
 from test.test_tkinter.widget_tests import (
     add_configure_tests,
     AbstractWidgetTest,
@@ -323,7 +320,10 @@ def test_configure_image(self):
         widget = self.create()
         image = tkinter.PhotoImage(master=self.root, name='image1')
         self.checkParam(widget, 'image', image, conv=str)
-        errmsg = messages['no_image'].format('spam')
+        if tk_version < (9, 0):
+            errmsg = 'image "spam" doesn\'t exist'
+        else:
+            errmsg = 'image "spam" does not exist'
         with self.assertRaises(tkinter.TclError) as cm:
             widget['image'] = 'spam'
         if errmsg is not None:

Lib/test/test_tkinter/widget_tests.py

@@ -4,10 +4,6 @@
 import tkinter
 from test.test_tkinter.support import (AbstractTkTest, requires_tk, tk_version,
                                   pixels_conv, tcl_obj_eq)
-if tk_version < (9,0):
-    from test.test_tkinter.support import is_pixel_str, messages_v1 as messages
-else:
-    from test.test_tkinter.support import is_pixel_str, messages_v2 as messages
 import test.support
 
 _sentinel = object()
@@ -179,8 +175,12 @@ def checkReliefParam(self, widget, name, *, allow_empty=False):
     def checkImageParam(self, widget, name):
         image = tkinter.PhotoImage(master=self.root, name='image1')
         self.checkParam(widget, name, image, conv=str)
+        if tk_version < (9, 0):
+            errmsg = 'image "spam" doesn\'t exist'
+        else:
+            errmsg = 'image "spam" does not exist'
         self.checkInvalidParam(widget, name, 'spam',
-                errmsg=messages['no_image'].format('spam'))
+                               errmsg=errmsg)
         widget[name] = ''
 
     def checkVariableParam(self, widget, name, var):
@@ -356,8 +356,11 @@ def test_configure_font(self):
                         '-Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*')
         is_ttk = widget.__class__.__module__ == 'tkinter.ttk'
         if not is_ttk:
-            self.checkInvalidParam(widget, 'font', '',
-                                   errmsg=messages['no_font'].format(''))
+            if tk_version < (9,0):
+                errmsg = 'font "" doesn\'t exist'
+            else:
+                errmsg = 'font "" does not exist'
+            self.checkInvalidParam(widget, 'font', '', errmsg=errmsg)
 
     def test_configure_foreground(self):
         widget = self.create()

Lib/test/test_ttk/test_widgets.py

@@ -8,10 +8,6 @@
 from test.test_tkinter.support import (
     AbstractTkTest, requires_tk, tk_version, get_tk_patchlevel,
     simulate_mouse_click, AbstractDefaultRootTest)
-if tk_version < (9,0):
-    from test.test_tkinter.support import messages_v1 as messages
-else:
-    from test.test_tkinter.support import messages_v2 as messages
 from test.test_tkinter.widget_tests import (add_configure_tests,
     AbstractWidgetTest, StandardOptionsTests, IntegerSizeTests, PixelSizeTests)
 
@@ -186,8 +182,11 @@ def checkImageParam(self, widget, name):
                         expected=('image1', 'active', 'image2'))
         self.checkParam(widget, name, 'image1 active image2',
                         expected=('image1', 'active', 'image2'))
-        self.checkInvalidParam(widget, name, 'spam',
-                errmsg=messages['no_image'].format('spam'))
+        if tk_version < (9, 0):
+            errmsg = 'image "spam" doesn\'t exist'
+        else:
+            errmsg = 'image "spam" does not exist'
+        self.checkInvalidParam(widget, name, 'spam', errmsg=errmsg)
 
     def test_configure_compound(self):
         values = ('none', 'text', 'image', 'center', 'top', 'bottom', 'left', 'right')