Fix test_tk under OS X with Tk 8.4. Patch by Ned Deily.
This should fix some buildbot failures.
diff --git a/Lib/tkinter/test/test_tkinter/test_font.py b/Lib/tkinter/test/test_tkinter/test_font.py
index 7bd9900..dfd630b 100644
--- a/Lib/tkinter/test/test_tkinter/test_font.py
+++ b/Lib/tkinter/test/test_tkinter/test_font.py
@@ -15,8 +15,13 @@
support.root_withdraw()
def test_font_eq(self):
- font1 = font.nametofont("TkDefaultFont")
- font2 = font.nametofont("TkDefaultFont")
+ fontname = "TkDefaultFont"
+ try:
+ f = font.Font(name=fontname, exists=True)
+ except tkinter._tkinter.TclError:
+ f = font.Font(name=fontname, exists=False)
+ font1 = font.nametofont(fontname)
+ font2 = font.nametofont(fontname)
self.assertIsNot(font1, font2)
self.assertEqual(font1, font2)
self.assertNotEqual(font1, font1.copy())