Issue #24408: Prevent test_font failures with non-ascii font names.

diff --git a/Lib/lib-tk/test/test_tkinter/test_font.py b/Lib/lib-tk/test/test_tkinter/test_font.py
index cb30f054be291651d5e05e7eaff80ac8445ca218..e0bffee5efdb0701d42c82d4bc81bc3ebb05d769 100644 (file)
--- a/Lib/lib-tk/test/test_tkinter/test_font.py
+++ b/Lib/lib-tk/test/test_tkinter/test_font.py
@@ -79,7 +79,7 @@ class FontTest(AbstractTkTest, unittest.TestCase):
         self.assertIsInstance(families, tuple)
         self.assertTrue(families)
         for family in families:
-            self.assertIsInstance(family, str)
+            self.assertIsInstance(family, (str, unicode))
             self.assertTrue(family)
 
     def test_names(self):
@@ -87,7 +87,7 @@ class FontTest(AbstractTkTest, unittest.TestCase):
         self.assertIsInstance(names, tuple)
         self.assertTrue(names)
         for name in names:
-            self.assertIsInstance(name, str)
+            self.assertIsInstance(name, (str, unicode))
             self.assertTrue(name)
         self.assertIn(fontname, names)