From 3ec153681e4e5553fc6882699beb5af6d45c75e6 Mon Sep 17 00:00:00 2001 From: Alexander Belopolsky Date: Thu, 20 Sep 2012 16:39:33 -0400 Subject: [PATCH] Issue #15973: Fixed segmentation fault on timezone comparison to other types. --- Lib/datetime.py | 2 ++ Lib/test/datetimetester.py | 2 ++ Modules/_datetimemodule.c | 10 +++++++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Lib/datetime.py b/Lib/datetime.py index 65f95d20308..bf23e5002d9 100644 --- a/Lib/datetime.py +++ b/Lib/datetime.py @@ -1821,6 +1821,8 @@ class timezone(tzinfo): 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 index 3fd6799b579..bb18630339d 100644 --- a/Lib/test/datetimetester.py +++ b/Lib/test/datetimetester.py @@ -235,6 +235,8 @@ class TestTimeZone(unittest.TestCase): 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 index 8f571adf371..444cc00d2c5 100644 --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -3243,9 +3243,13 @@ static PyObject * timezone_richcompare(PyDateTime_TimeZone *self, PyDateTime_TimeZone *other, int op) { - if (op != Py_EQ && op != Py_NE) { - Py_INCREF(Py_NotImplemented); - return Py_NotImplemented; + 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); }