gh-124111: Update tkinter for compatibility with Tcl/Tk 9.0.0

Lib/test/test_tkinter/support.py

@@ -1,4 +1,5 @@
 import functools
+import re
 import tkinter
 
 class AbstractTkTest:
@@ -112,6 +113,10 @@ def get_tk_patchlevel(root):
 def pixels_conv(value):
     return float(value[:-1]) * units[value[-1:]]
 
+pix_re = re.compile(r'[0-9]*\.?[0-9]*[cimp]{1}')
+def is_pixel_str(x):
+    return pix_re.fullmatch(x) != None
+
 def tcl_obj_eq(actual, expected):
     if actual == expected:
         return True

Lib/test/test_tkinter/test_misc.py

@@ -4,7 +4,7 @@
 from tkinter import TclError
 import enum
 from test import support
-from test.test_tkinter.support import AbstractTkTest, AbstractDefaultRootTest, requires_tk
+from test.test_tkinter.support import AbstractTkTest, AbstractDefaultRootTest, requires_tk, tk_version
 
 support.requires('gui')
 
@@ -66,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, "can't find busy window"):
+        errmsg = r"can(no|')t find busy window.*"
+        with self.assertRaisesRegex(TclError, errmsg):
             f.tk_busy_configure()
-        with self.assertRaisesRegex(TclError, "can't find busy window"):
+        with self.assertRaisesRegex(TclError, errmsg):
             f.tk_busy_forget()
 
     @requires_tk(8, 6, 6)
@@ -87,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, "can't find busy window"):
+        errmsg = r"can(no|')t find busy window.*"
+        with self.assertRaisesRegex(TclError, errmsg):
             f.tk_busy_cget('cursor')
 
     def test_tk_setPalette(self):