encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-04 04:20:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactor compat url pattern/resolver imports

Browse Source
This commit is contained in:
Ryan P Kilby 2017-11-09 10:20:02 -05:00
parent dd628cc176
commit c01d9d63ee
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rest_framework/compat.py
View File

@ -18,14 +18,14 @@ from django.views.generic import View
try: try:
from django.urls import ( # noqa from django.urls import ( # noqa
URLPattern as RegexURLPattern, URLPattern,
URLResolver as RegexURLResolver, URLResolver,
) )
except ImportError: except ImportError:
# Will be removed in Django 2.0 # Will be removed in Django 2.0
from django.urls import ( # noqa from django.urls import ( # noqa
RegexURLPattern, RegexURLPattern as URLPattern,
RegexURLResolver, RegexURLResolver as URLResolver,
) )
@ -42,11 +42,11 @@ def make_url_resolver(regex, urlpatterns):
try: try:
# Django 2.0 # Django 2.0
from django.urls.resolvers import RegexPattern from django.urls.resolvers import RegexPattern
return RegexURLResolver(RegexPattern(regex), urlpatterns) return URLResolver(RegexPattern(regex), urlpatterns)
except ImportError: except ImportError:
# Django < 2.0 # Django < 2.0
return RegexURLResolver(regex, urlpatterns) return URLResolver(regex, urlpatterns)
def unicode_repr(instance): def unicode_repr(instance):

6
rest_framework/schemas/generators.py
View File

@ -15,7 +15,7 @@ from django.utils import six
from rest_framework import exceptions from rest_framework import exceptions
from rest_framework.compat import ( from rest_framework.compat import (
RegexURLPattern, RegexURLResolver, coreapi, coreschema, get_regex_pattern URLPattern, URLResolver, coreapi, coreschema, get_regex_pattern
) )
from rest_framework.request import clone_request from rest_framework.request import clone_request
from rest_framework.settings import api_settings from rest_framework.settings import api_settings
@ -165,7 +165,7 @@ class EndpointEnumerator(object):
for pattern in patterns: for pattern in patterns:
path_regex = prefix + get_regex_pattern(pattern) path_regex = prefix + get_regex_pattern(pattern)
if isinstance(pattern, RegexURLPattern): if isinstance(pattern, URLPattern):
path = self.get_path_from_regex(path_regex) path = self.get_path_from_regex(path_regex)
callback = pattern.callback callback = pattern.callback
if self.should_include_endpoint(path, callback): if self.should_include_endpoint(path, callback):
@ -173,7 +173,7 @@ class EndpointEnumerator(object):
endpoint = (path, method, callback) endpoint = (path, method, callback)
api_endpoints.append(endpoint) api_endpoints.append(endpoint)
elif isinstance(pattern, RegexURLResolver): elif isinstance(pattern, URLResolver):
nested_endpoints = self.get_api_endpoints( nested_endpoints = self.get_api_endpoints(
patterns=pattern.url_patterns, patterns=pattern.url_patterns,
prefix=path_regex prefix=path_regex

4
rest_framework/urlpatterns.py
View File

@ -2,14 +2,14 @@ from __future__ import unicode_literals
from django.conf.urls import include, url from django.conf.urls import include, url
from rest_framework.compat import RegexURLResolver, get_regex_pattern from rest_framework.compat import URLResolver, get_regex_pattern
from rest_framework.settings import api_settings from rest_framework.settings import api_settings
def apply_suffix_patterns(urlpatterns, suffix_pattern, suffix_required): def apply_suffix_patterns(urlpatterns, suffix_pattern, suffix_required):
ret = [] ret = []
for urlpattern in urlpatterns: for urlpattern in urlpatterns:
if isinstance(urlpattern, RegexURLResolver): if isinstance(urlpattern, URLResolver):
# Set of included URL patterns # Set of included URL patterns
regex = get_regex_pattern(urlpattern) regex = get_regex_pattern(urlpattern)
namespace = urlpattern.namespace namespace = urlpattern.namespace