[Python-checkins] cpython (2.7): Issue #24408: Prevent test_font failures with non-ascii font names.

Sun Jun 21 22:57:55 CEST 2015

https://hg.python.org/cpython/rev/20c9290a5de4
changeset: 96638:20c9290a5de4
branch: 2.7
parent: 96631:5a902eda298d
user: Ned Deily <nad at acm.org>
date: Sun Jun 21 13:57:30 2015 -0700
summary:
 Issue #24408: Prevent test_font failures with non-ascii font names.
files:
 Lib/lib-tk/test/test_tkinter/test_font.py | 4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lib/lib-tk/test/test_tkinter/test_font.py b/Lib/lib-tk/test/test_tkinter/test_font.py
--- a/Lib/lib-tk/test/test_tkinter/test_font.py
+++ b/Lib/lib-tk/test/test_tkinter/test_font.py
@@ -79,7 +79,7 @@
 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 @@
 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)
 
-- 
Repository URL: https://hg.python.org/cpython
