summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorMatthew Somerville <matthew-github@dracos.co.uk>2015-06-05 21:56:00 +0100
committerTim Graham <timograham@gmail.com>2015-11-11 16:53:26 -0500
commit3ded51bcf21f384b2e80ce97aff5c12d63e5f0e3 (patch)
treeaba3de8a35e025addf9a3c031be32124d1b384da /django
parentae4613803cb344a26b158934e785a82147515db0 (diff)
[1.8.x] Fixed #24937 -- Fixed serialization of Date(Time)RangeField.
Use the DjangoJSONEncoder so that datetime and date are encoded appropriately. Backport of 2926559cce34e48efb4b073721926d737e372dd3 from master
Diffstat (limited to 'django')
-rw-r--r--django/contrib/postgres/fields/ranges.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/contrib/postgres/fields/ranges.py b/django/contrib/postgres/fields/ranges.py
index 679e87f44e..5681c373c0 100644
--- a/django/contrib/postgres/fields/ranges.py
+++ b/django/contrib/postgres/fields/ranges.py
@@ -3,6 +3,7 @@ import json
from psycopg2.extras import DateRange, DateTimeTZRange, NumericRange, Range
from django.contrib.postgres import forms, lookups
+from django.core.serializers.json import DjangoJSONEncoder
from django.db import models
from django.utils import six
@@ -41,7 +42,7 @@ class RangeField(models.Field):
"lower": value.lower,
"upper": value.upper,
"bounds": value._bounds,
- })
+ }, cls=DjangoJSONEncoder)
def formfield(self, **kwargs):
kwargs.setdefault('form_class', self.form_field)