diff options
| author | Mjumbe Wawatu Poe | 2012-09-07 17:05:21 -0400 |
|---|---|---|
| committer | Mjumbe Wawatu Poe | 2012-09-07 17:05:21 -0400 |
| commit | 7d9125bcb69950e54bb9c2ca61f59403c1018178 (patch) | |
| tree | bb020483d1eeffdbbfa3fa0ab2682c99142c2e3e /djangorestframework/fields.py | |
| parent | 72bdd0fcec7faa32d7f24e0698736f9433b56f3f (diff) | |
| download | django-rest-framework-7d9125bcb69950e54bb9c2ca61f59403c1018178.tar.bz2 | |
Fix Django 1.3 compatibility
Diffstat (limited to 'djangorestframework/fields.py')
| -rw-r--r-- | djangorestframework/fields.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/djangorestframework/fields.py b/djangorestframework/fields.py index a44eb417..13b0e37d 100644 --- a/djangorestframework/fields.py +++ b/djangorestframework/fields.py @@ -8,10 +8,10 @@ from django.core.exceptions import ValidationError from django.conf import settings from django.db import DEFAULT_DB_ALIAS from django.db.models.related import RelatedObject -from django.utils import timezone -from django.utils.dateparse import parse_date, parse_datetime from django.utils.encoding import is_protected_type, smart_unicode from django.utils.translation import ugettext_lazy as _ +from djangorestframework.compat import parse_date, parse_datetime +from djangorestframework.compat import timezone def is_simple_callable(obj): @@ -317,7 +317,7 @@ class DateField(Field): if value is None: return value if isinstance(value, datetime.datetime): - if settings.USE_TZ and timezone.is_aware(value): + if timezone and settings.USE_TZ and timezone.is_aware(value): # Convert aware datetimes to the default time zone # before casting them to dates (#17742). default_timezone = timezone.get_default_timezone() |
