diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-10-05 11:24:49 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-10-05 11:24:49 (GMT) |
| commit | 2f92e783b82520eeaa5aa6f84d54a550c794a779 (patch) | |
| tree | a0dc60c17106f98aa3652f4d3740a6ed4756f5d8 /Lib/tkinter | |
| parent | eeed95538e287a95e399b9b7a27cd37cb3cf7589 (diff) | |
| download | cpython-2f92e783b82520eeaa5aa6f84d54a550c794a779.zip cpython-2f92e783b82520eeaa5aa6f84d54a550c794a779.tar.gz cpython-2f92e783b82520eeaa5aa6f84d54a550c794a779.tar.bz2 | |
Fix test_tk under OS X with Tk 8.4. Patch by Ned Deily.
This should fix some buildbot failures.
Diffstat (limited to 'Lib/tkinter')
| -rw-r--r-- | Lib/tkinter/test/test_tkinter/test_font.py | 9 |
1 files changed, 7 insertions, 2 deletions
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 @@ class FontTest(unittest.TestCase): 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()) |