[Python-checkins] cpython (merge 3.2 -> default): merged 3.2

[alexander.belopolsky]

http://hg.python.org/cpython/rev/63cb0a642c84
changeset:   79072:63cb0a642c84
parent:      79067:ad04dd6c07f7
parent:      79071:9fba12ceb2fd
user:        Alexander Belopolsky <alexander.belopolsky at gmail.com>
date:        Thu Sep 20 16:42:34 2012 -0400
summary:
  merged 3.2

files:
  Lib/datetime.py            |  2 ++
  Lib/test/datetimetester.py |  2 ++
  Modules/_datetimemodule.c  |  6 ++++++
  3 files changed, 10 insertions(+), 0 deletions(-)


diff --git a/Lib/datetime.py b/Lib/datetime.py
--- a/Lib/datetime.py
+++ b/Lib/datetime.py
@@ -1854,6 +1854,8 @@
         return (self._offset, self._name)
 
     def __eq__(self, other):
+        if type(other) != timezone:
+            return False
         return self._offset == other._offset
 
     def __hash__(self):
diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
--- a/Lib/test/datetimetester.py
+++ b/Lib/test/datetimetester.py
@@ -235,6 +235,8 @@
         self.assertEqual(timezone(-5 * HOUR), timezone(-5 * HOUR, 'EST'))
         with self.assertRaises(TypeError): timezone(ZERO) < timezone(ZERO)
         self.assertIn(timezone(ZERO), {timezone(ZERO)})
+        self.assertTrue(timezone(ZERO) != None)
+        self.assertFalse(timezone(ZERO) ==  None)
 
     def test_aware_datetime(self):
         # test that timezone instances can be used by datetime
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -3215,6 +3215,12 @@
 {
     if (op != Py_EQ && op != Py_NE)
         Py_RETURN_NOTIMPLEMENTED;
+    if (Py_TYPE(other) != &PyDateTime_TimeZoneType) {
+	if (op == Py_EQ)
+	    Py_RETURN_FALSE;
+	else
+	    Py_RETURN_TRUE;
+    }
     return delta_richcompare(self->offset, other->offset, op);
 }
 

-- 
Repository URL: http://hg.python.org/cpython