diff options
Diffstat (limited to 'djangorestframework/utils/encoders.py')
| -rw-r--r-- | djangorestframework/utils/encoders.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/djangorestframework/utils/encoders.py b/djangorestframework/utils/encoders.py index ba7c8553..74876017 100644 --- a/djangorestframework/utils/encoders.py +++ b/djangorestframework/utils/encoders.py @@ -3,8 +3,8 @@ Helper classes for parsers. """ import datetime import decimal -from django.utils import timezone from django.utils import simplejson as json +from djangorestframework.compat import timezone class JSONEncoder(json.JSONEncoder): @@ -25,7 +25,7 @@ class JSONEncoder(json.JSONEncoder): elif isinstance(o, datetime.date): return o.isoformat() elif isinstance(o, datetime.time): - if timezone.is_aware(o): + if timezone and timezone.is_aware(o): raise ValueError("JSON can't represent timezone-aware times.") r = o.isoformat() if o.microsecond: |