diff options
author | gweis <gerhard.weis@gmail.com> | 2015-06-23 09:29:04 +1000 |
---|---|---|
committer | gweis <gerhard.weis@gmail.com> | 2015-06-23 09:29:04 +1000 |
commit | 5af8080596ab780b873279d92ae1145123a7495e (patch) | |
tree | e92673e850a3045b5813799026aa59f3f61801f6 | |
parent | 3417bc297e88d701c7e616bd1045e1fd8ed5f959 (diff) | |
parent | 418196d5586f278b8d2417103b108b9d5007f6b7 (diff) | |
download | isodate-5af8080596ab780b873279d92ae1145123a7495e.tar.gz |
Merge pull request #24 from gfairchild/master
Make Duration objects hashable
-rw-r--r-- | src/isodate/duration.py | 7 | ||||
-rw-r--r-- | src/isodate/tests/test_duration.py | 19 |
2 files changed, 25 insertions, 1 deletions
diff --git a/src/isodate/duration.py b/src/isodate/duration.py index e3283b3..437afe8 100644 --- a/src/isodate/duration.py +++ b/src/isodate/duration.py @@ -134,6 +134,13 @@ class Duration(object): self.tdelta.days, self.tdelta.seconds, self.tdelta.microseconds, self.years, self.months) + def __hash__(self): + ''' + Return a hash of this instance so that it can be used in, for + example, dicts and sets. + ''' + return hash((self.tdelta, self.months, self.years)) + def __neg__(self): """ A simple unary minus. diff --git a/src/isodate/tests/test_duration.py b/src/isodate/tests/test_duration.py index 6cf6b65..910001e 100644 --- a/src/isodate/tests/test_duration.py +++ b/src/isodate/tests/test_duration.py @@ -272,13 +272,30 @@ class DurationTest(unittest.TestCase): def test_repr(self): ''' - Test __repr__ and __str__ for Duration obqects. + Test __repr__ and __str__ for Duration objects. ''' dur = Duration(10, 10, years=10, months=10) self.assertEqual('10 years, 10 months, 10 days, 0:00:10', str(dur)) self.assertEqual('isodate.duration.Duration(10, 10, 0,' ' years=10, months=10)', repr(dur)) + def test_hash(self): + ''' + Test __hash__ for Duration objects. + ''' + dur1 = Duration(10, 10, years=10, months=10) + dur2 = Duration(9, 9, years=9, months=9) + dur3 = Duration(10, 10, years=10, months=10) + self.assertNotEqual(hash(dur1), hash(dur2)) + self.assertNotEqual(id(dur1), id(dur2)) + self.assertEqual(hash(dur1), hash(dur3)) + self.assertNotEqual(id(dur1), id(dur3)) + durSet = set() + durSet.add(dur1) + durSet.add(dur2) + durSet.add(dur3) + self.assertEqual(len(durSet), 2) + def test_neg(self): ''' Test __neg__ for Duration objects. |