From 5c0f9f147ce887d2c47dd26652d3d694c4186cc4 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Mon, 23 Jan 2017 17:22:32 +0100 Subject: [PATCH] Removed unnecessary utc wrapper. (#4839) --- rest_framework/compat.py | 9 --------- rest_framework/fields.py | 3 ++- tests/test_fields.py | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index a85425c72..b0e076203 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -312,12 +312,3 @@ def set_many(instance, field, value): else: field = getattr(instance, field) field.set(value) - - -try: - # A `utc` instance is available in Django 1.11+ - from django.utils.timezone import utc -except ImportError: - # A `UTC` class is available in older versions - from django.utils.timezone import UTC - utc = UTC() diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 7b292d2c0..6d21d670a 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -28,11 +28,12 @@ from django.utils.encoding import is_protected_type, smart_text from django.utils.formats import localize_input, sanitize_separators from django.utils.functional import cached_property from django.utils.ipv6 import clean_ipv6_address +from django.utils.timezone import utc 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, utc, value_from_object + get_remote_field, unicode_repr, unicode_to_repr, value_from_object ) from rest_framework.exceptions import ErrorDetail, ValidationError from rest_framework.settings import api_settings diff --git a/tests/test_fields.py b/tests/test_fields.py index 28d1d79f3..5de6546fc 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -9,10 +9,10 @@ import pytest from django.http import QueryDict from django.test import TestCase, override_settings from django.utils import six +from django.utils.timezone import utc import rest_framework from rest_framework import serializers -from rest_framework.compat import utc from rest_framework.fields import is_simple_callable try: