Drop all compat support to Django < 2 urls (#7337)

Author: jairhenrique

rest_framework/compat.py

@@ -5,65 +5,6 @@
 from django.conf import settings
 from django.views.generic import View
 
-try:
-    from django.urls import (  # noqa
-        URLPattern,
-        URLResolver,
-    )
-except ImportError:
-    # Will be removed in Django 2.0
-    from django.urls import (  # noqa
-        RegexURLPattern as URLPattern,
-        RegexURLResolver as URLResolver,
-    )
-
-
-def get_original_route(urlpattern):
-    """
-    Get the original route/regex that was typed in by the user into the path(), re_path() or url() directive. This
-    is in contrast with get_regex_pattern below, which for RoutePattern returns the raw regex generated from the path().
-    """
-    if hasattr(urlpattern, 'pattern'):
-        # Django 2.0
-        return str(urlpattern.pattern)
-    else:
-        # Django < 2.0
-        return urlpattern.regex.pattern
-
-
-def get_regex_pattern(urlpattern):
-    """
-    Get the raw regex out of the urlpattern's RegexPattern or RoutePattern. This is always a regular expression,
-    unlike get_original_route above.
-    """
-    if hasattr(urlpattern, 'pattern'):
-        # Django 2.0
-        return urlpattern.pattern.regex.pattern
-    else:
-        # Django < 2.0
-        return urlpattern.regex.pattern
-
-
-def is_route_pattern(urlpattern):
-    if hasattr(urlpattern, 'pattern'):
-        # Django 2.0
-        from django.urls.resolvers import RoutePattern
-        return isinstance(urlpattern.pattern, RoutePattern)
-    else:
-        # Django < 2.0
-        return False
-
-
-def make_url_resolver(regex, urlpatterns):
-    try:
-        # Django 2.0
-        from django.urls.resolvers import RegexPattern
-        return URLResolver(RegexPattern(regex), urlpatterns)
-
-    except ImportError:
-        # Django < 2.0
-        return URLResolver(regex, urlpatterns)
-
 
 def unicode_http_header(value):
     # Coerce HTTP header value to unicode.

rest_framework/schemas/generators.py

@@ -10,9 +10,9 @@
 from django.contrib.admindocs.views import simplify_regex
 from django.core.exceptions import PermissionDenied
 from django.http import Http404
+from django.urls import URLPattern, URLResolver
 
 from rest_framework import exceptions
-from rest_framework.compat import URLPattern, URLResolver, get_original_route
 from rest_framework.request import clone_request
 from rest_framework.settings import api_settings
 from rest_framework.utils.model_meta import _get_pk
@@ -79,7 +79,7 @@ def get_api_endpoints(self, patterns=None, prefix=''):
         api_endpoints = []
 
         for pattern in patterns:
-            path_regex = prefix + get_original_route(pattern)
+            path_regex = prefix + str(pattern.pattern)
             if isinstance(pattern, URLPattern):
                 path = self.get_path_from_regex(path_regex)
                 callback = pattern.callback

rest_framework/urlpatterns.py

@@ -1,9 +1,7 @@
 from django.conf.urls import include, url
-from django.urls import path, register_converter
+from django.urls import URLResolver, path, register_converter
+from django.urls.resolvers import RoutePattern
 
-from rest_framework.compat import (
-    URLResolver, get_regex_pattern, is_route_pattern
-)
 from rest_framework.settings import api_settings
 
 
@@ -38,7 +36,7 @@ def apply_suffix_patterns(urlpatterns, suffix_pattern, suffix_required, suffix_r
     for urlpattern in urlpatterns:
         if isinstance(urlpattern, URLResolver):
             # Set of included URL patterns
-            regex = get_regex_pattern(urlpattern)
+            regex = urlpattern.pattern.regex.pattern
             namespace = urlpattern.namespace
             app_name = urlpattern.app_name
             kwargs = urlpattern.default_kwargs
@@ -49,7 +47,7 @@ def apply_suffix_patterns(urlpatterns, suffix_pattern, suffix_required, suffix_r
                                              suffix_route)
 
             # if the original pattern was a RoutePattern we need to preserve it
-            if is_route_pattern(urlpattern):
+            if isinstance(urlpattern.pattern, RoutePattern):
                 assert path is not None
                 route = str(urlpattern.pattern)
                 new_pattern = path(route, include((patterns, app_name), namespace), kwargs)
@@ -59,7 +57,7 @@ def apply_suffix_patterns(urlpatterns, suffix_pattern, suffix_required, suffix_r
             ret.append(new_pattern)
         else:
             # Regular URL pattern
-            regex = get_regex_pattern(urlpattern).rstrip('$').rstrip('/') + suffix_pattern
+            regex = urlpattern.pattern.regex.pattern.rstrip('$').rstrip('/') + suffix_pattern
             view = urlpattern.callback
             kwargs = urlpattern.default_args
             name = urlpattern.name
@@ -68,7 +66,7 @@ def apply_suffix_patterns(urlpatterns, suffix_pattern, suffix_required, suffix_r
                 ret.append(urlpattern)
 
             # if the original pattern was a RoutePattern we need to preserve it
-            if is_route_pattern(urlpattern):
+            if isinstance(urlpattern.pattern, RoutePattern):
                 assert path is not None
                 assert suffix_route is not None
                 route = str(urlpattern.pattern).rstrip('$').rstrip('/') + suffix_route

tests/schemas/test_coreapi.py

@@ -10,7 +10,7 @@
 from rest_framework import (
     filters, generics, pagination, permissions, serializers
 )
-from rest_framework.compat import coreapi, coreschema, get_regex_pattern
+from rest_framework.compat import coreapi, coreschema
 from rest_framework.decorators import action, api_view, schema
 from rest_framework.request import Request
 from rest_framework.routers import DefaultRouter, SimpleRouter
@@ -1079,7 +1079,7 @@ def test_should_include_endpoint_excludes_correctly(self):
         inspector = EndpointEnumerator(self.patterns)
 
         # Not pretty. Mimics internals of EndpointEnumerator to put should_include_endpoint under test
-        pairs = [(inspector.get_path_from_regex(get_regex_pattern(pattern)), pattern.callback)
+        pairs = [(inspector.get_path_from_regex(pattern.pattern.regex.pattern), pattern.callback)
                  for pattern in self.patterns]
 
         should_include = [

tests/test_filters.py

@@ -1,7 +1,6 @@
 import datetime
 from importlib import reload as reload_module
 
-import django
 import pytest
 from django.core.exceptions import ImproperlyConfigured
 from django.db import models
@@ -191,7 +190,6 @@ def test_search_field_with_null_characters(self):
 
         assert terms == ['asdf']
 
-    @pytest.mark.skipif(django.VERSION[:2] < (2, 2), reason="requires django 2.2 or higher")
     def test_search_field_with_additional_transforms(self):
         from django.test.utils import register_lookup
 

tests/test_routers.py

@@ -8,7 +8,6 @@
 from django.urls import resolve, reverse
 
 from rest_framework import permissions, serializers, viewsets
-from rest_framework.compat import get_regex_pattern
 from rest_framework.decorators import action
 from rest_framework.response import Response
 from rest_framework.routers import DefaultRouter, SimpleRouter
@@ -192,8 +191,7 @@ def setUp(self):
 
     def test_custom_lookup_field_route(self):
         detail_route = notes_router.urls[-1]
-        detail_url_pattern = get_regex_pattern(detail_route)
-        assert '<uuid>' in detail_url_pattern
+        assert '<uuid>' in detail_route.pattern.regex.pattern
 
     def test_retrieve_lookup_field_list_view(self):
         response = self.client.get('/example/notes/')
@@ -229,7 +227,7 @@ class NoteViewSet(viewsets.ModelViewSet):
     def test_urls_limited_by_lookup_value_regex(self):
         expected = ['^notes/$', '^notes/(?P<uuid>[0-9a-f]{32})/$']
         for idx in range(len(expected)):
-            assert expected[idx] == get_regex_pattern(self.urls[idx])
+            assert expected[idx] == self.urls[idx].pattern.regex.pattern
 
 
 @override_settings(ROOT_URLCONF='tests.test_routers')
@@ -249,8 +247,7 @@ def setUp(self):
 
     def test_custom_lookup_url_kwarg_route(self):
         detail_route = kwarged_notes_router.urls[-1]
-        detail_url_pattern = get_regex_pattern(detail_route)
-        assert '^notes/(?P<text>' in detail_url_pattern
+        assert '^notes/(?P<text>' in detail_route.pattern.regex.pattern
 
     def test_retrieve_lookup_url_kwarg_detail_view(self):
         response = self.client.get('/example2/notes/fo/')
@@ -273,7 +270,7 @@ class NoteViewSet(viewsets.ModelViewSet):
     def test_urls_have_trailing_slash_by_default(self):
         expected = ['^notes/$', '^notes/(?P<pk>[^/.]+)/$']
         for idx in range(len(expected)):
-            assert expected[idx] == get_regex_pattern(self.urls[idx])
+            assert expected[idx] == self.urls[idx].pattern.regex.pattern
 
 
 class TestTrailingSlashRemoved(TestCase):
@@ -288,7 +285,7 @@ class NoteViewSet(viewsets.ModelViewSet):
     def test_urls_can_have_trailing_slash_removed(self):
         expected = ['^notes$', '^notes/(?P<pk>[^/.]+)$']
         for idx in range(len(expected)):
-            assert expected[idx] == get_regex_pattern(self.urls[idx])
+            assert expected[idx] == self.urls[idx].pattern.regex.pattern
 
 
 class TestNameableRoot(TestCase):

tests/test_urlpatterns.py

@@ -3,9 +3,9 @@
 
 from django.conf.urls import include, url
 from django.test import TestCase
-from django.urls import Resolver404, path, re_path
+from django.urls import Resolver404, URLResolver, path, re_path
+from django.urls.resolvers import RegexPattern
 
-from rest_framework.compat import make_url_resolver
 from rest_framework.test import APIRequestFactory
 from rest_framework.urlpatterns import format_suffix_patterns
 
@@ -28,7 +28,7 @@ def _resolve_urlpatterns(self, urlpatterns, test_paths, allowed=None):
             urlpatterns = format_suffix_patterns(urlpatterns, allowed=allowed)
         except Exception:
             self.fail("Failed to apply `format_suffix_patterns` on  the supplied urlpatterns")
-        resolver = make_url_resolver(r'^/', urlpatterns)
+        resolver = URLResolver(RegexPattern(r'^/'), urlpatterns)
         for test_path in test_paths:
             try:
                 test_path, expected_resolved = test_path