fixed old version compatibility for make_naive and django.forms.utils

rest_framework/fields.py

@@ -13,7 +13,6 @@ from django.core.exceptions import ValidationError as DjangoValidationError
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.validators import RegexValidator, ip_address_validators
 from django.forms import ImageField as DjangoImageField
-from django.forms.utils import from_current_timezone
 from django.utils import six, timezone
 from django.utils.dateparse import parse_date, parse_datetime, parse_time
 from django.utils.encoding import is_protected_type, smart_text
@@ -30,6 +29,12 @@ 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:
     """

tests/test_fields.py

@@ -868,7 +868,7 @@ class TestAwareDateTimeField:
 
     @override_settings(USE_TZ=True)
     def test_with_timezone_active(self):
-        naive_now = timezone.make_naive(timezone.now())
+        naive_now = timezone.make_naive(timezone.now(), timezone.UTC())
         timezone.activate(FakeTimezone())
         field = serializers.DateTimeField(default_timezone=timezone.UTC())
         aware_now = field.enforce_timezone(naive_now)
@@ -877,7 +877,7 @@ class TestAwareDateTimeField:
 
     @override_settings(USE_TZ=True)
     def test_without_timezone_active(self):
-        naive_now = timezone.make_naive(timezone.now())
+        naive_now = timezone.make_naive(timezone.now(), timezone.UTC())
         field = serializers.DateTimeField(default_timezone=timezone.UTC())
         aware_now = field.enforce_timezone(naive_now)
         assert aware_now.tzname() == 'UTC'