Kaydet (Commit) 186f6654 authored tarafından Serhiy Storchaka's avatar Serhiy Storchaka

Issue #1730136: Fix comparison between a tk Font object and an object of a

different type.
üst 63a47478
import unittest
import Tkinter
#from Tkinter
import tkFont as font
from test.test_support import requires, run_unittest
import test_ttk.support as support
requires('gui')
class FontTest(unittest.TestCase):
def setUp(self):
support.root_deiconify()
def tearDown(self):
support.root_withdraw()
def test_font_eq(self):
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())
self.assertNotEqual(font1, 0)
self.assertNotIn(font1, [0])
tests_gui = (FontTest, )
if __name__ == "__main__":
run_unittest(*tests_gui)
...@@ -97,7 +97,7 @@ class Font: ...@@ -97,7 +97,7 @@ class Font:
return self.name return self.name
def __eq__(self, other): def __eq__(self, other):
return self.name == other.name and isinstance(other, Font) return isinstance(other, Font) and self.name == other.name
def __getitem__(self, key): def __getitem__(self, key):
return self.cget(key) return self.cget(key)
......
...@@ -13,6 +13,9 @@ Core and Builtins ...@@ -13,6 +13,9 @@ Core and Builtins
Library Library
------- -------
- Issue #1730136: Fix the comparison between a tkFont.Font and an object of
another kind.
- Issue #19884: readline: Disable the meta modifier key if stdout is not - Issue #19884: readline: Disable the meta modifier key if stdout is not
a terminal to not write the ANSI sequence "\033[1034h" into stdout. This a terminal to not write the ANSI sequence "\033[1034h" into stdout. This
sequence is used on some terminal (ex: TERM=xterm-256color") to enable sequence is used on some terminal (ex: TERM=xterm-256color") to enable
......
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