traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merged 3.2

This commit is contained in:
Alexander Belopolsky 2012-09-20 16:42:34 -04:00
parent 7c6c80d89f 3ec153681e
commit 9b9ed867bc
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/datetime.py
View File

@ -1854,6 +1854,8 @@ class timezone(tzinfo):
return (self._offset, self._name) return (self._offset, self._name)
def __eq__(self, other): def __eq__(self, other):
if type(other) != timezone:
return False
return self._offset == other._offset return self._offset == other._offset
def __hash__(self): def __hash__(self):

2
Lib/test/datetimetester.py
View File

@ -235,6 +235,8 @@ class TestTimeZone(unittest.TestCase):
self.assertEqual(timezone(-5 * HOUR), timezone(-5 * HOUR, 'EST')) self.assertEqual(timezone(-5 * HOUR), timezone(-5 * HOUR, 'EST'))
with self.assertRaises(TypeError): timezone(ZERO) < timezone(ZERO) with self.assertRaises(TypeError): timezone(ZERO) < timezone(ZERO)
self.assertIn(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): def test_aware_datetime(self):
# test that timezone instances can be used by datetime # test that timezone instances can be used by datetime

6
Modules/_datetimemodule.c
View File

@ -3215,6 +3215,12 @@ timezone_richcompare(PyDateTime_TimeZone *self,
{ {
if (op != Py_EQ && op != Py_NE) if (op != Py_EQ && op != Py_NE)
Py_RETURN_NOTIMPLEMENTED; 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); return delta_richcompare(self->offset, other->offset, op);
} }