From 7d9125bcb69950e54bb9c2ca61f59403c1018178 Mon Sep 17 00:00:00 2001
From: Mjumbe Wawatu Poe
Date: Fri, 7 Sep 2012 17:05:21 -0400
Subject: Fix Django 1.3 compatibility

---
 djangorestframework/utils/encoders.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'djangorestframework/utils/encoders.py')

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:
-- 
cgit v1.2.3