diff --git a/lib/_range.py b/lib/_range.py index 306f1f73..0f159908 100644 --- a/lib/_range.py +++ b/lib/_range.py @@ -121,6 +121,8 @@ class Range(object): return self._bounds is not None def __eq__(self, other): + if not isinstance(other, Range): + return False return (self._lower == other._lower and self._upper == other._upper and self._bounds == other._bounds) diff --git a/tests/test_types_extras.py b/tests/test_types_extras.py index 98fbbadf..eded26a1 100755 --- a/tests/test_types_extras.py +++ b/tests/test_types_extras.py @@ -1212,6 +1212,19 @@ class RangeTestCase(unittest.TestCase): assert_not_equal(Range(10, 20), Range(11, 20)) assert_not_equal(Range(10, 20, '[)'), Range(10, 20, '[]')) + def test_eq_wrong_type(self): + from psycopg2.extras import Range + self.assertFalse(Range(10, 20)==()) + + def test_eq_subclass(self): + from psycopg2.extras import Range, NumericRange + + class IntRange(NumericRange): pass + class PositiveIntRange(IntRange): pass + + self.assertTrue(Range(10, 20)==IntRange(10, 20)) + self.assertTrue(PositiveIntRange(10, 20)==IntRange(10, 20)) + def test_not_ordered(self): from psycopg2.extras import Range self.assertRaises(TypeError, lambda: Range(empty=True) < Range(0,4))