Removed the occurances of django>=(5,1) checking and usaage of pytz.

Author: p-r-a-v-i-n

rest_framework/compat.py

@@ -2,10 +2,6 @@
 The `compat` module provides support for backwards compatibility with older
 versions of Django/Python, and compatibility wrappers around optional packages.
 """
-import django
-from django.db import models
-from django.db.models.constants import LOOKUP_SEP
-from django.db.models.sql.query import Node
 from django.views.generic import View
 
 
@@ -141,52 +137,8 @@ def md_filter_add_syntax_highlight(md):
         return False
 
 
-if django.VERSION >= (5, 1):
-    # Django 5.1+: use the stock ip_address_validators function
-    # Note: Before Django 5.1, ip_address_validators returns a tuple containing
-    #       1) the list of validators and 2) the error message. Starting from
-    #       Django 5.1 ip_address_validators only returns the list of validators
-    from django.core.validators import ip_address_validators
-
-    def get_referenced_base_fields_from_q(q):
-        return q.referenced_base_fields
-
-else:
-    # Django <= 5.1: create a compatibility shim for ip_address_validators
-    from django.core.validators import \
-        ip_address_validators as _ip_address_validators
-
-    def ip_address_validators(protocol, unpack_ipv4):
-        return _ip_address_validators(protocol, unpack_ipv4)[0]
-
-    # Django < 5.1: create a compatibility shim for Q.referenced_base_fields
-    # https://github.com/django/django/blob/5.1a1/django/db/models/query_utils.py#L179
-    def _get_paths_from_expression(expr):
-        if isinstance(expr, models.F):
-            yield expr.name
-        elif hasattr(expr, 'flatten'):
-            for child in expr.flatten():
-                if isinstance(child, models.F):
-                    yield child.name
-                elif isinstance(child, models.Q):
-                    yield from _get_children_from_q(child)
-
-    def _get_children_from_q(q):
-        for child in q.children:
-            if isinstance(child, Node):
-                yield from _get_children_from_q(child)
-            elif isinstance(child, tuple):
-                lhs, rhs = child
-                yield lhs
-                if hasattr(rhs, 'resolve_expression'):
-                    yield from _get_paths_from_expression(rhs)
-            elif hasattr(child, 'resolve_expression'):
-                yield from _get_paths_from_expression(child)
-
-    def get_referenced_base_fields_from_q(q):
-        return {
-            child.split(LOOKUP_SEP, 1)[0] for child in _get_children_from_q(q)
-        }
+def get_referenced_base_fields_from_q(q):
+    return q.referenced_base_fields
 
 
 # `separators` argument to `json.dumps()` differs between 2.x and 3.x

rest_framework/fields.py

@@ -16,7 +16,7 @@
 from django.core.validators import (
     EmailValidator, MaxLengthValidator, MaxValueValidator, MinLengthValidator,
     MinValueValidator, ProhibitNullCharactersValidator, RegexValidator,
-    URLValidator
+    URLValidator, ip_address_validators
 )
 from django.forms import FilePathField as DjangoFilePathField
 from django.forms import ImageField as DjangoImageField
@@ -30,13 +30,7 @@
 from django.utils.ipv6 import clean_ipv6_address
 from django.utils.translation import gettext_lazy as _
 
-try:
-    import pytz
-except ImportError:
-    pytz = None
-
 from rest_framework import DJANGO_DURATION_FORMAT, ISO_8601
-from rest_framework.compat import ip_address_validators
 from rest_framework.exceptions import ErrorDetail, ValidationError
 from rest_framework.settings import api_settings
 from rest_framework.utils import html, humanize_datetime, json, representation
@@ -1185,8 +1179,6 @@ def enforce_timezone(self, value):
                     self.fail('make_aware', timezone=field_timezone)
                 return dt
             except Exception as e:
-                if pytz and isinstance(e, pytz.exceptions.InvalidTimeError):
-                    self.fail('make_aware', timezone=field_timezone)
                 raise e
         elif (field_timezone is None) and timezone.is_aware(value):
             return timezone.make_naive(value, datetime.timezone.utc)

rest_framework/views.py

@@ -1,7 +1,6 @@
 """
 Provides an APIView class that is the base of all views in REST framework.
 """
-from django import VERSION as DJANGO_VERSION
 from django.conf import settings
 from django.core.exceptions import PermissionDenied
 from django.db import connections, models
@@ -142,8 +141,7 @@ def force_evaluation():
 
         # Exempt all DRF views from Django's LoginRequiredMiddleware. Users should set
         # DEFAULT_PERMISSION_CLASSES to 'rest_framework.permissions.IsAuthenticated' instead
-        if DJANGO_VERSION >= (5, 1):
-            view.login_required = False
+        view.login_required = False
 
         # Note: session based authentication is explicitly CSRF validated,
         # all other authentication is CSRF exempt.

rest_framework/viewsets.py

@@ -19,7 +19,6 @@
 from functools import update_wrapper
 from inspect import getmembers
 
-from django import VERSION as DJANGO_VERSION
 from django.urls import NoReverseMatch
 from django.utils.decorators import classonlymethod
 from django.views.decorators.csrf import csrf_exempt
@@ -140,8 +139,7 @@ def view(request, *args, **kwargs):
 
         # Exempt from Django's LoginRequiredMiddleware. Users should set
         # DEFAULT_PERMISSION_CLASSES to 'rest_framework.permissions.IsAuthenticated' instead
-        if DJANGO_VERSION >= (5, 1):
-            view.login_required = False
+        view.login_required = False
 
         return csrf_exempt(view)
 

tests/test_middleware.py

@@ -1,6 +1,3 @@
-import unittest
-
-import django
 from django.contrib.auth.models import User
 from django.http import HttpRequest
 from django.test import override_settings
@@ -113,7 +110,6 @@ def test_middleware_can_access_request_post_when_processing_response(self):
         assert response.status_code == 200
 
 
-@unittest.skipUnless(django.VERSION >= (5, 1), 'Only for Django 5.1+')
 @override_settings(
     ROOT_URLCONF='tests.test_middleware',
     MIDDLEWARE=(

tests/test_views.py

@@ -1,7 +1,5 @@
 import copy
-import unittest
 
-from django import VERSION as DJANGO_VERSION
 from django.test import TestCase
 
 from rest_framework import status
@@ -140,7 +138,6 @@ def test_get_exception_handler(self):
         assert response.data == {'error': 'SyntaxError'}
 
 
-@unittest.skipUnless(DJANGO_VERSION >= (5, 1), 'Only for Django 5.1+')
 class TestLoginRequiredMiddlewareCompat(TestCase):
     def test_class_based_view_opted_out(self):
         class_based_view = BasicView.as_view()

tests/test_viewsets.py

@@ -1,8 +1,6 @@
-import unittest
 from functools import wraps
 
 import pytest
-from django import VERSION as DJANGO_VERSION
 from django.db import models
 from django.test import TestCase, override_settings
 from django.urls import include, path
@@ -198,7 +196,6 @@ def test_viewset_action_attr_for_extra_action(self):
         assert get.view.action == 'list_action'
         assert head.view.action == 'list_action'
 
-    @unittest.skipUnless(DJANGO_VERSION >= (5, 1), 'Only for Django 5.1+')
     def test_login_required_middleware_compat(self):
         view = ActionViewSet.as_view(actions={'get': 'list'})
         assert view.login_required is False