encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-08 06:14:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

from_current_timezone is unnecessary, using timezone.make_aware instead

Browse Source
This commit is contained in:
Tim Saylor 2015-07-09 11:01:07 -05:00
parent b182ee5966
commit a825098440
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rest_framework/fields.py
View File

@ -29,12 +29,6 @@ from rest_framework.exceptions import ValidationError
from rest_framework.settings import api_settings
from rest_framework.utils import html, humanize_datetime, representation
# django.form.util was renamed in 1.7
try:
from django.forms.utils import from_current_timezone
except ImportError:
from django.forms.util import from_current_timezone
class empty:
"""
@ -909,10 +903,10 @@ class DateTimeField(Field):
When `self.default_timezone` is not `None`, always return aware datetimes.
"""
if (self.default_timezone is not None) and not timezone.is_aware(value):
# If a timezone is active, we want to use it, but if not we want to use the timezone
# If a timezone is active we want to use it, but if not we want to use the timezone
# specified for this field over the system's default timezone.
if hasattr(timezone._active, 'value'):
return from_current_timezone(value)
return timezone.make_aware(value, timezone._active.value)
else:
return timezone.make_aware(value, self.default_timezone)
elif (self.default_timezone is None) and timezone.is_aware(value):