aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/utils/encoders.py
diff options
context:
space:
mode:
authorMjumbe Wawatu Poe2012-09-07 17:05:21 -0400
committerMjumbe Wawatu Poe2012-09-07 17:05:21 -0400
commit7d9125bcb69950e54bb9c2ca61f59403c1018178 (patch)
treebb020483d1eeffdbbfa3fa0ab2682c99142c2e3e /djangorestframework/utils/encoders.py
parent72bdd0fcec7faa32d7f24e0698736f9433b56f3f (diff)
downloaddjango-rest-framework-7d9125bcb69950e54bb9c2ca61f59403c1018178.tar.bz2
Fix Django 1.3 compatibility
Diffstat (limited to 'djangorestframework/utils/encoders.py')
-rw-r--r--djangorestframework/utils/encoders.py4
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: