fix: fix removedInDjango40 errors

edx_api_doc_tools/conf_utils.py

@@ -5,12 +5,12 @@
 """
 
 from django.conf import settings
-from django.conf.urls import url
 from django.views.generic.base import RedirectView
 from drf_yasg import openapi
 from drf_yasg.generators import OpenAPISchemaGenerator
 from drf_yasg.views import get_schema_view
 from rest_framework import permissions
+from django.urls import path, re_path
 
 
 def make_docs_urls(api_info, api_url_patterns=None):
@@ -86,19 +86,15 @@ def get_docs_urls(docs_data_view, docs_ui_view):
  urlpatterns += get_docs_urls(custom_doc_data_view, custom_doc_ui_view)
  """
  return [
- url(
+ re_path(
  r'^swagger(?P<format>\.json|\.yaml)$',
  docs_data_view,
  name='apidocs-data',
  ),
- url(
- r'^api-docs/$',
- docs_ui_view,
+ path('api-docs/', docs_ui_view,
  name='apidocs-ui',
  ),
- url(
- r'^swagger/$',
- RedirectView.as_view(pattern_name='apidocs-ui', permanent=False),
+ path('swagger/', RedirectView.as_view(pattern_name='apidocs-ui', permanent=False),
  name='apidocs-ui-swagger',
  ),
  ]

edx_api_doc_tools/urls.py

@@ -1,11 +1,10 @@
 """
 URLs for edx_api_doc_tools.
 """
-
-from django.conf.urls import url
 from django.views.generic import TemplateView
+from django.urls import path
 
 
 urlpatterns = [
- url(r'', TemplateView.as_view(template_name="edx_api_doc_tools/base.html")),
+ path('', TemplateView.as_view(template_name="edx_api_doc_tools/base.html")),
 ]

example/urls.py

@@ -1,13 +1,12 @@
 """
 REST API URLs for reading and writing to the edX Hedgehog Database.
 """
-
-from django.conf.urls import url
 from rest_framework.routers import SimpleRouter
 
 from edx_api_doc_tools import make_api_info, make_docs_urls
 
 from .views import HedgehogInfoView, HedgehogUndocumentedView, HedgehogUndocumentedViewset, HedgehogViewSet
+from django.urls import path
 
 
 urlpatterns = []
@@ -22,8 +21,8 @@
 urlpatterns += ROUTER.urls
 
 urlpatterns += [
- url(r'/api/hedgehog/v0/info', HedgehogInfoView.as_view()),
- url(r'/api/hedgehog/v0/undoc-view', HedgehogUndocumentedView.as_view()),
+ path('/api/hedgehog/v0/info', HedgehogInfoView.as_view()),
+ path('/api/hedgehog/v0/undoc-view', HedgehogUndocumentedView.as_view()),
 ]
 
 urlpatterns += make_docs_urls(

example/urls_with_pattern.py

@@ -2,24 +2,23 @@
 REST API URLs for testing make_docs_urls with url pattern specified.
 """
 
-from django.conf.urls import url
-
 from edx_api_doc_tools import make_api_info, make_docs_urls
 
 from .views import HedgehogInfoView, HedgehogUndocumentedView
+from django.urls import path
 
 
 urlpatterns = []
 
 urlpatterns += [
- url(r'/api/hedgehog/v1/info', HedgehogInfoView.as_view()),
- url(r'/api/hedgehog/v1/undoc-view', HedgehogUndocumentedView.as_view()),
- url(r'/test/hedgehog/v1/info', HedgehogInfoView.as_view()),
- url(r'/test/hedgehog/v1/undoc-view', HedgehogUndocumentedView.as_view()),
+ path('/api/hedgehog/v1/info', HedgehogInfoView.as_view()),
+ path('/api/hedgehog/v1/undoc-view', HedgehogUndocumentedView.as_view()),
+ path('/test/hedgehog/v1/info', HedgehogInfoView.as_view()),
+ path('/test/hedgehog/v1/undoc-view', HedgehogUndocumentedView.as_view()),
 ]
 
 display_urls = [
- url(r'/test/hedgehog/v1/info', HedgehogInfoView.as_view()),
+ path('/test/hedgehog/v1/info', HedgehogInfoView.as_view()),
 ]
 
 urlpatterns += make_docs_urls(