Remove Django 1.10 compat code

Ryan P Kilby · Ryan P Kilby · commit 8313a881029c · 2017-12-05T03:45:38.000-05:00
diff --git a/.isort.cfg b/.isort.cfg
@@ -3,5 +3,5 @@ skip=.tox
 atomic=true
 multi_line_output=5
 known_standard_library=types
-known_third_party=pytest,_pytest,django
+known_third_party=pytest,_pytest,django,pytz
 known_first_party=rest_framework
diff --git a/requirements/requirements-optionals.txt b/requirements/requirements-optionals.txt
@@ -1,5 +1,4 @@
 # Optional packages which may be used with REST framework.
-pytz==2017.2
 markdown==2.6.4
 django-guardian==1.4.9
 django-filter==1.1.0
diff --git a/rest_framework/compat.py b/rest_framework/compat.py
@@ -248,13 +248,6 @@ def md_filter_add_syntax_highlight(md):
     def md_filter_add_syntax_highlight(md):
         return False
 
-# pytz is required from Django 1.11. Remove when dropping Django 1.10 support.
-try:
-    import pytz  # noqa
-    from pytz.exceptions import InvalidTimeError
-except ImportError:
-    InvalidTimeError = Exception
-
 
 # `separators` argument to `json.dumps()` differs between 2.x and 3.x
 # See: http://bugs.python.org/issue22767
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
@@ -29,11 +29,12 @@
 from django.utils.ipv6 import clean_ipv6_address
 from django.utils.timezone import utc
 from django.utils.translation import ugettext_lazy as _
+from pytz.exceptions import InvalidTimeError
 
 from rest_framework import ISO_8601
 from rest_framework.compat import (
-    InvalidTimeError, MaxLengthValidator, MaxValueValidator,
-    MinLengthValidator, MinValueValidator, unicode_repr, unicode_to_repr
+    MaxLengthValidator, MaxValueValidator, MinLengthValidator,
+    MinValueValidator, unicode_repr, unicode_to_repr
 )
 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
@@ -6,20 +6,16 @@
 from decimal import ROUND_DOWN, ROUND_UP, Decimal
 
 import pytest
+import pytz
 from django.http import QueryDict
 from django.test import TestCase, override_settings
 from django.utils import six
 from django.utils.timezone import activate, deactivate, utc
 
 import rest_framework
-from rest_framework import compat, serializers
+from rest_framework import serializers
 from rest_framework.fields import DjangoImageField, is_simple_callable
 
-try:
-    import pytz
-except ImportError:
-    pytz = None
-
 try:
     import typings
 except ImportError:
@@ -1250,7 +1246,6 @@ class TestNaiveDateTimeField(FieldValues):
     field = serializers.DateTimeField(default_timezone=None)
 
 
-@pytest.mark.skipif(pytz is None, reason='pytz not installed')
 class TestTZWithDateTimeField(FieldValues):
     """
     Valid and invalid values for `DateTimeField` when not using UTC as the timezone.
@@ -1273,7 +1268,6 @@ def setup_class(cls):
         cls.field = serializers.DateTimeField(default_timezone=kolkata)
 
 
-@pytest.mark.skipif(pytz is None, reason='pytz not installed')
 @override_settings(TIME_ZONE='UTC', USE_TZ=True)
 class TestDefaultTZDateTimeField(TestCase):
     """
@@ -1312,7 +1306,7 @@ class TestNaiveDayLightSavingTimeTimeZoneDateTimeField(FieldValues):
     class MockTimezone:
         @staticmethod
         def localize(value, is_dst):
-            raise compat.InvalidTimeError()
+            raise pytz.InvalidTimeError()
 
         def __str__(self):
             return 'America/New_York'

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`# Optional packages which may be used with REST framework.`
`2`		`-pytz==2017.2`
`3`	`2`	`markdown==2.6.4`
`4`	`3`	`django-guardian==1.4.9`
`5`	`4`	`django-filter==1.1.0`