From: Ned Deily <nad@acm.org>
Date: Sun, 21 Jun 2015 20:57:30 +0000 (-0700)
Subject: Issue #24408: Prevent test_font failures with non-ascii font names.
X-Git-Tag: v2.7.11rc1~262
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9487043453622047ba39abb36f55f4e43bf3e749;p=thirdparty%2FPython%2Fcpython.git

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 cb30f054be29..e0bffee5efdb 100644
--- 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)