Commit 94870434 authored by Ned Deily's avatar Ned Deily

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

parent 1670af6c
...@@ -79,7 +79,7 @@ class FontTest(AbstractTkTest, unittest.TestCase): ...@@ -79,7 +79,7 @@ class FontTest(AbstractTkTest, unittest.TestCase):
self.assertIsInstance(families, tuple) self.assertIsInstance(families, tuple)
self.assertTrue(families) self.assertTrue(families)
for family in families: for family in families:
self.assertIsInstance(family, str) self.assertIsInstance(family, (str, unicode))
self.assertTrue(family) self.assertTrue(family)
def test_names(self): def test_names(self):
...@@ -87,7 +87,7 @@ class FontTest(AbstractTkTest, unittest.TestCase): ...@@ -87,7 +87,7 @@ class FontTest(AbstractTkTest, unittest.TestCase):
self.assertIsInstance(names, tuple) self.assertIsInstance(names, tuple)
self.assertTrue(names) self.assertTrue(names)
for name in names: for name in names:
self.assertIsInstance(name, str) self.assertIsInstance(name, (str, unicode))
self.assertTrue(name) self.assertTrue(name)
self.assertIn(fontname, names) self.assertIn(fontname, names)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment