mirror of
https://github.com/encode/django-rest-framework.git
synced 2025-07-27 16:40:03 +03:00
url() replaced on re_path() in urlpatterns.py
This commit is contained in:
parent
17ead92970
commit
71ab8974b0
|
@ -1,5 +1,5 @@
|
||||||
from django.conf.urls import include, url
|
from django.conf.urls import include
|
||||||
from django.urls import URLResolver, path, register_converter
|
from django.urls import URLResolver, path, re_path, register_converter
|
||||||
from django.urls.resolvers import RoutePattern
|
from django.urls.resolvers import RoutePattern
|
||||||
|
|
||||||
from rest_framework.settings import api_settings
|
from rest_framework.settings import api_settings
|
||||||
|
@ -52,7 +52,7 @@ def apply_suffix_patterns(urlpatterns, suffix_pattern, suffix_required, suffix_r
|
||||||
route = str(urlpattern.pattern)
|
route = str(urlpattern.pattern)
|
||||||
new_pattern = path(route, include((patterns, app_name), namespace), kwargs)
|
new_pattern = path(route, include((patterns, app_name), namespace), kwargs)
|
||||||
else:
|
else:
|
||||||
new_pattern = url(regex, include((patterns, app_name), namespace), kwargs)
|
new_pattern = re_path(regex, include((patterns, app_name), namespace), kwargs)
|
||||||
|
|
||||||
ret.append(new_pattern)
|
ret.append(new_pattern)
|
||||||
else:
|
else:
|
||||||
|
@ -72,7 +72,7 @@ def apply_suffix_patterns(urlpatterns, suffix_pattern, suffix_required, suffix_r
|
||||||
route = str(urlpattern.pattern).rstrip('$').rstrip('/') + suffix_route
|
route = str(urlpattern.pattern).rstrip('$').rstrip('/') + suffix_route
|
||||||
new_pattern = path(route, view, kwargs, name)
|
new_pattern = path(route, view, kwargs, name)
|
||||||
else:
|
else:
|
||||||
new_pattern = url(regex, view, kwargs, name)
|
new_pattern = re_path(regex, view, kwargs, name)
|
||||||
|
|
||||||
ret.append(new_pattern)
|
ret.append(new_pattern)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user