[Python-checkins] r84865 - in python/branches/py3k: Lib/tkinter/font.py Lib/tkinter/test/test_tkinter/test_font.py Misc/NEWS

[amaury.forgeotdarc]

Author: amaury.forgeotdarc
Date: Sat Sep 18 01:27:09 2010
New Revision: 84865

Log:
#1730136: Fix comparison between a tk Font object and an object of a different type.


Added:
   python/branches/py3k/Lib/tkinter/test/test_tkinter/test_font.py   (contents, props changed)
Modified:
   python/branches/py3k/Lib/tkinter/font.py
   python/branches/py3k/Misc/NEWS

Modified: python/branches/py3k/Lib/tkinter/font.py
==============================================================================
--- python/branches/py3k/Lib/tkinter/font.py	(original)
+++ python/branches/py3k/Lib/tkinter/font.py	Sat Sep 18 01:27:09 2010
@@ -97,7 +97,7 @@
         return self.name
 
     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):
         return self.cget(key)

Added: python/branches/py3k/Lib/tkinter/test/test_tkinter/test_font.py
==============================================================================
--- (empty file)
+++ python/branches/py3k/Lib/tkinter/test/test_tkinter/test_font.py	Sat Sep 18 01:27:09 2010
@@ -0,0 +1,20 @@
+import unittest
+import tkinter
+from tkinter import font
+from test.support import requires, run_unittest
+
+requires('gui')
+
+class FontTest(unittest.TestCase):
+    def test_font_eq(self):
+        font1 = font.nametofont("system")
+        font2 = font.nametofont("system")
+        self.assertIsNot(font1, font2)
+        self.assertEqual(font1, font2)
+        self.assertNotEqual(font1, font1.copy())
+        self.assertNotEqual(font1, 0)
+
+tests_gui = (FontTest, )
+
+if __name__ == "__main__":
+    run_unittest(*tests_gui)

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sat Sep 18 01:27:09 2010
@@ -52,6 +52,9 @@
 Library
 -------
 
+- Issue #1730136: Fix the comparison between a tk.font.Font and an object of
+  another kind.
+
 - Issue #9441: logging has better coverage for rotating file handlers.
 
 - Issue #9865:  collections.OrderedDict now has a __sizeof__ method.