tests: make tests compatible with both psycopg2 and 3

Hipo · Aug 7, 2023 · bfa7d90 · bfa7d90
1 parent f47e9f3
commit bfa7d90
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/drf_extra_fields/fields.py b/drf_extra_fields/fields.py
@@ -254,12 +254,6 @@ def to_representation(self, value):
             upper = value.upper
             bounds = value._bounds
 
-        if bounds:
-            if lower is None and bounds[0] == "[":
-                bounds = "(" + bounds[1]
-            if upper is None and bounds[1] == "]":
-                bounds = bounds[0] + ")"
-
         return {'lower': self.child.to_representation(lower) if lower is not None else None,
                 'upper': self.child.to_representation(upper) if upper is not None else None,
                 'bounds': bounds}

diff --git a/tests/test_fields.py b/tests/test_fields.py
@@ -417,7 +417,7 @@ class DateTimeRangeSerializer(serializers.Serializer):
 
 class DateRangeSerializer(serializers.Serializer):
 
-    range = DateRangeField(initial=DateRange(None, None))
+    range = DateRangeField(initial=DateRange(None, None, '()'))
 
 
 class DateRangeWithAllowEmptyFalseSerializer(serializers.Serializer):
@@ -504,7 +504,7 @@ class TestIntegerRangeField(FieldValues):
         (NumericRange(**{'lower': '1', 'upper': '2'}),
          {'lower': 1, 'upper': 2, 'bounds': '[)'}),
         (NumericRange(**{'empty': True}), {'empty': True}),
-        (NumericRange(), {'bounds': '()', 'lower': None, 'upper': None}),
+        (NumericRange(bounds='()'), {'bounds': '()', 'lower': None, 'upper': None}),
         ({'lower': '1', 'upper': 2, 'bounds': '[)'},
          {'lower': 1, 'upper': 2, 'bounds': '[)'}),
         ({'lower': 1, 'upper': 2},
@@ -557,7 +557,7 @@ class TestIntegerRangeChildAllowNullField(FieldValues):
         (NumericRange(**{'lower': '1', 'upper': '2'}),
          {'lower': 1, 'upper': 2, 'bounds': '[)'}),
         (NumericRange(**{'empty': True}), {'empty': True}),
-        (NumericRange(), {'bounds': '()', 'lower': None, 'upper': None}),
+        (NumericRange(bounds='()'), {'bounds': '()', 'lower': None, 'upper': None}),
         ({'lower': '1', 'upper': 2, 'bounds': '[)'},
          {'lower': 1, 'upper': 2, 'bounds': '[)'}),
         ({'lower': 1, 'upper': 2},
@@ -596,7 +596,7 @@ class TestDecimalRangeField(FieldValues):
         (NumericRange(**{'lower': '1.1', 'upper': '2'}),
          {'lower': '1.1', 'upper': '2', 'bounds': '[)'}),
         (NumericRange(**{'empty': True}), {'empty': True}),
-        (NumericRange(), {'bounds': '()', 'lower': None, 'upper': None}),
+        (NumericRange(bounds='()'), {'bounds': '()', 'lower': None, 'upper': None}),
         ({'lower': Decimal('1.1'), 'upper': "2.3", 'bounds': '[)'},
          {'lower': "1.1", 'upper': "2.3", 'bounds': '[)'}),
         ({'lower': Decimal('1.1'), 'upper': "2.3"},
@@ -647,7 +647,7 @@ class TestDecimalRangeFieldWithChildAttribute(FieldValues):
         (NumericRange(**{'lower': '1.1', 'upper': '2'}),
          {'lower': '1.10', 'upper': '2.00', 'bounds': '[)'}),
         (NumericRange(**{'empty': True}), {'empty': True}),
-        (NumericRange(), {'bounds': '()', 'lower': None, 'upper': None}),
+        (NumericRange(bounds='()'), {'bounds': '()', 'lower': None, 'upper': None}),
         ({'lower': Decimal('1.1'), 'upper': "2.3", 'bounds': '[)'},
          {'lower': "1.10", 'upper': "2.30", 'bounds': '[)'}),
         ({'lower': Decimal('1.1'), 'upper': "2.3"},
@@ -690,7 +690,7 @@ class TestFloatRangeField(FieldValues):
         (NumericRange(**{'lower': '1.1', 'upper': '2'}),
          {'lower': 1.1, 'upper': 2, 'bounds': '[)'}),
         (NumericRange(**{'empty': True}), {'empty': True}),
-        (NumericRange(), {'bounds': '()', 'lower': None, 'upper': None}),
+        (NumericRange(bounds='()'), {'bounds': '()', 'lower': None, 'upper': None}),
         ({'lower': '1', 'upper': 2., 'bounds': '[)'},
          {'lower': 1., 'upper': 2., 'bounds': '[)'}),
         ({'lower': 1., 'upper': 2.},
@@ -760,7 +760,7 @@ class TestDateTimeRangeField(TestCase, FieldValues):
              'bounds': '[)'}),
         (DateTimeTZRange(**{'empty': True}),
          {'empty': True}),
-        (DateTimeTZRange(),
+        (DateTimeTZRange(bounds='()'),
          {'bounds': '()', 'lower': None, 'upper': None}),
         ({'lower': '2001-01-01T13:00:00Z',
           'upper': '2001-02-02T13:00:00Z',
@@ -775,7 +775,7 @@ class TestDateTimeRangeField(TestCase, FieldValues):
           'upper': '2001-02-02T13:00:00Z',
           'bounds': '[)'}),
         ({'upper': '2001-02-02T13:00:00Z', 'bounds': '[)'},
-         {'lower': None, 'upper': '2001-02-02T13:00:00Z', 'bounds': '()'}),
+         {'lower': None, 'upper': '2001-02-02T13:00:00Z', 'bounds': '[)'}),
         ({'lower': '2001-01-01T13:00:00Z', 'bounds': '[)'},
          {'lower': '2001-01-01T13:00:00Z', 'upper': None, 'bounds': '[)'}),
         ({}, {}),
@@ -838,7 +838,7 @@ class TestDateRangeField(FieldValues):
              'bounds': '[)'}),
         (DateRange(**{'empty': True}),
          {'empty': True}),
-        (DateRange(), {'bounds': '()', 'lower': None, 'upper': None}),
+        (DateRange(bounds='()'), {'bounds': '()', 'lower': None, 'upper': None}),
         ({'lower': '2001-01-01',
           'upper': '2001-02-02',
           'bounds': '[)'},
@@ -852,9 +852,9 @@ class TestDateRangeField(FieldValues):
           'upper': '2001-02-02',
           'bounds': '[)'}),
         ({'upper': '2001-02-02', 'bounds': '[)'},
-         {'lower': None, 'upper': '2001-02-02', 'bounds': '()'}),
+         {'lower': None, 'upper': '2001-02-02', 'bounds': '[)'}),
         ({'lower': '2001-01-01', 'bounds': '[)'},
-         {'lower': '2001-01-01', 'upper': None, 'bounds': '[)'}),
+         {'lower': '2001-01-01', 'upper': None,  'bounds': '[)'}),
         ({}, {}),
     ]
     field = DateRangeField()