From 1366730a3fb43e652b894d47629fbac665db1574 Mon Sep 17 00:00:00 2001
From: hellerve <veit@veitheller.de>
Date: Mon, 27 May 2019 22:41:10 +0200
Subject: [PATCH] netbox urls: move to re_path as suggested by @jeremystretch

---
 netbox/netbox/urls.py          | 7 ++-----
 netbox/utilities/converters.py | 8 --------
 2 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 netbox/utilities/converters.py

diff --git a/netbox/netbox/urls.py b/netbox/netbox/urls.py
index 6a1db6dea..efcd17a87 100644
--- a/netbox/netbox/urls.py
+++ b/netbox/netbox/urls.py
@@ -1,17 +1,14 @@
 from django.conf import settings
 from django.conf.urls import include
-from django.urls import path, register_converter
+from django.urls import path, re_path
 from django.views.static import serve
 from drf_yasg import openapi
 from drf_yasg.views import get_schema_view
 
 from netbox.views import APIRootView, HomeView, SearchView
 from users.views import LoginView, LogoutView
-from utilities import converters
 from .admin import admin_site
 
-register_converter(converters.JSONOrYAMLConverter, 'json_or_yaml')
-
 schema_view = get_schema_view(
     openapi.Info(
         title="NetBox API",
@@ -56,7 +53,7 @@ _patterns = [
     path(r'api/virtualization/', include('virtualization.api.urls')),
     path(r'api/docs/', schema_view.with_ui('swagger'), name='api_docs'),
     path(r'api/redoc/', schema_view.with_ui('redoc'), name='api_redocs'),
-    path(r'api/swagger<json_or_yaml:format>', schema_view.without_ui(), name='schema_swagger'),
+    re_path(r'^api/swagger(?P<format>.json|.yaml)$', schema_view.without_ui(), name='schema_swagger'),
 
     # Serving static media in Django to pipe it through LoginRequiredMiddleware
     path(r'media/<path:path>', serve, {'document_root': settings.MEDIA_ROOT}),
diff --git a/netbox/utilities/converters.py b/netbox/utilities/converters.py
deleted file mode 100644
index d8b8f69c4..000000000
--- a/netbox/utilities/converters.py
+++ /dev/null
@@ -1,8 +0,0 @@
-class JSONOrYAMLConverter:
-    regex = '.json|.yaml'
-
-    def to_python(self, value):
-        return value
-
-    def to_url(self, value):
-        return value