Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions rest_framework/compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -212,16 +212,6 @@ def md_filter_add_syntax_highlight(md):
return False


# Django 1.x url routing syntax. Remove when dropping Django 1.11 support.
try:
from django.urls import include, path, re_path, register_converter # noqa
except ImportError:
from django.conf.urls import include, url # noqa
path = None
register_converter = None
re_path = url


# `separators` argument to `json.dumps()` differs between 2.x and 3.x
# See: https://bugs.python.org/issue22767
SHORT_SEPARATORS = (',', ':')
Expand Down
3 changes: 2 additions & 1 deletion rest_framework/urlpatterns.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from django.conf.urls import include, url
from django.urls import path, register_converter

from rest_framework.compat import (
URLResolver, get_regex_pattern, is_route_pattern, path, register_converter
URLResolver, get_regex_pattern, is_route_pattern
)
from rest_framework.settings import api_settings

Expand Down
3 changes: 2 additions & 1 deletion tests/schemas/test_coreapi.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
from django.core.exceptions import PermissionDenied
from django.http import Http404
from django.test import TestCase, override_settings
from django.urls import path

from rest_framework import (
filters, generics, pagination, permissions, serializers
)
from rest_framework.compat import coreapi, coreschema, get_regex_pattern, path
from rest_framework.compat import coreapi, coreschema, get_regex_pattern
from rest_framework.decorators import action, api_view, schema
from rest_framework.request import Request
from rest_framework.routers import DefaultRouter, SimpleRouter
Expand Down
4 changes: 2 additions & 2 deletions tests/test_urlpatterns.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

from django.conf.urls import include, url
from django.test import TestCase
from django.urls import Resolver404
from django.urls import Resolver404, path, re_path

from rest_framework.compat import make_url_resolver, path, re_path
from rest_framework.compat import make_url_resolver
from rest_framework.test import APIRequestFactory
from rest_framework.urlpatterns import format_suffix_patterns

Expand Down