From bc3849bd5958a5e808587caa573aa01138d2b9d2 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 18 Jan 2017 19:31:04 +0600 Subject: [PATCH] added utc compat to fields --- rest_framework/fields.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index af6247c5e..1e001d085 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -32,7 +32,7 @@ from django.utils.translation import ugettext_lazy as _ from rest_framework import ISO_8601 from rest_framework.compat import ( - get_remote_field, unicode_repr, unicode_to_repr, value_from_object + get_remote_field, unicode_repr, unicode_to_repr, value_from_object, utc ) from rest_framework.exceptions import ErrorDetail, ValidationError from rest_framework.settings import api_settings @@ -1104,7 +1104,7 @@ class DateTimeField(Field): if (field_timezone is not None) and not timezone.is_aware(value): return timezone.make_aware(value, field_timezone) elif (field_timezone is None) and timezone.is_aware(value): - return timezone.make_naive(value, timezone.UTC()) + return timezone.make_naive(value, utc) return value def default_timezone(self):