psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2025-02-07 21:00:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Range objects are immutable and hashable

Browse Source
This commit is contained in:
Daniele Varrazzo 2012-09-23 22:40:13 +01:00
parent e002ea5937
commit a96a4349ed
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/_range.py
View File

@ -55,7 +55,8 @@ class Range(object):
"""
__slots__ = ('_lower', '_upper', '_bounds')
def __init__(self, lower=None, upper=None, bounds='[)', empty=False):
def __new__(cls, lower=None, upper=None, bounds='[)', empty=False):
self = super(Range, cls).__new__(cls)
if not empty:
if bounds not in ('[)', '(]', '()', '[]'):
raise ValueError("bound flags not valid: %r" % bounds)
@ -66,6 +67,7 @@ class Range(object):
else:
self._lower = self._upper = self._bounds = None
return self
def __repr__(self):
if self._bounds is None:
@ -131,6 +133,17 @@ class Range(object):
return True
def __eq__(self, other):
return (self._lower == other._lower
and self._upper == other._upper
and self._bounds == other._bounds)
def __ne__(self, other):
return not self.__eq__(other)
def __hash__(self):
return hash((self._lower, self._upper, self._bounds))
def register_range(pgrange, pyrange, conn_or_curs, globally=False):
"""Register a typecaster and an adapter for range a range type.

21
tests/test_types_extras.py
View File

@ -888,6 +888,27 @@ class RangeTestCase(unittest.TestCase):
self.assert_(20 not in r)
self.assert_(21 not in r)
def test_eq_hash(self):
from psycopg2.extras import Range
def assert_equal(r1, r2):
self.assert_(r1 == r2)
self.assert_(hash(r1) == hash(r2))
assert_equal(Range(empty=True), Range(empty=True))
assert_equal(Range(), Range())
assert_equal(Range(10, None), Range(10, None))
assert_equal(Range(10, 20), Range(10, 20))
assert_equal(Range(10, 20), Range(10, 20, '[)'))
assert_equal(Range(10, 20, '[]'), Range(10, 20, '[]'))
def assert_not_equal(r1, r2):
self.assert_(r1 != r2)
self.assert_(hash(r1) != hash(r2))
assert_not_equal(Range(10, 20), Range(10, 21))
assert_not_equal(Range(10, 20), Range(11, 20))
assert_not_equal(Range(10, 20, '[)'), Range(10, 20, '[]'))
def skip_if_no_range(f):
def skip_if_no_range_(self):