Skip to content

Commit b83e912

Browse files
authored
Remove compat urls for Django < 2.0 (#7335)
1 parent aed7496 commit b83e912

File tree

4 files changed

+6
-14
lines changed

4 files changed

+6
-14
lines changed

rest_framework/compat.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -212,16 +212,6 @@ def md_filter_add_syntax_highlight(md):
212212
return False
213213

214214

215-
# Django 1.x url routing syntax. Remove when dropping Django 1.11 support.
216-
try:
217-
from django.urls import include, path, re_path, register_converter # noqa
218-
except ImportError:
219-
from django.conf.urls import include, url # noqa
220-
path = None
221-
register_converter = None
222-
re_path = url
223-
224-
225215
# `separators` argument to `json.dumps()` differs between 2.x and 3.x
226216
# See: https://bugs.python.org/issue22767
227217
SHORT_SEPARATORS = (',', ':')

rest_framework/urlpatterns.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
from django.conf.urls import include, url
2+
from django.urls import path, register_converter
23

34
from rest_framework.compat import (
4-
URLResolver, get_regex_pattern, is_route_pattern, path, register_converter
5+
URLResolver, get_regex_pattern, is_route_pattern
56
)
67
from rest_framework.settings import api_settings
78

tests/schemas/test_coreapi.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
from django.core.exceptions import PermissionDenied
66
from django.http import Http404
77
from django.test import TestCase, override_settings
8+
from django.urls import path
89

910
from rest_framework import (
1011
filters, generics, pagination, permissions, serializers
1112
)
12-
from rest_framework.compat import coreapi, coreschema, get_regex_pattern, path
13+
from rest_framework.compat import coreapi, coreschema, get_regex_pattern
1314
from rest_framework.decorators import action, api_view, schema
1415
from rest_framework.request import Request
1516
from rest_framework.routers import DefaultRouter, SimpleRouter

tests/test_urlpatterns.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
from django.conf.urls import include, url
55
from django.test import TestCase
6-
from django.urls import Resolver404
6+
from django.urls import Resolver404, path, re_path
77

8-
from rest_framework.compat import make_url_resolver, path, re_path
8+
from rest_framework.compat import make_url_resolver
99
from rest_framework.test import APIRequestFactory
1010
from rest_framework.urlpatterns import format_suffix_patterns
1111

0 commit comments

Comments
 (0)