From 7422ea8357b04491311a130819eb68ce584eedab Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sat, 16 Dec 2017 00:43:49 +0100
Subject: [PATCH] Update urls app_name
---
api/config/api_urls.py | 22 ++++++++++++++++------
api/config/urls.py | 4 ++--
api/funkwhale_api/providers/urls.py | 9 ++++++---
api/funkwhale_api/radios/urls.py | 1 +
4 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/api/config/api_urls.py b/api/config/api_urls.py
index 5ed4cffd..13205fe3 100644
--- a/api/config/api_urls.py
+++ b/api/config/api_urls.py
@@ -25,22 +25,32 @@ v1_patterns = router.urls
v1_patterns += [
url(r'^providers/',
- include('funkwhale_api.providers.urls', namespace='providers')),
+ include(
+ ('funkwhale_api.providers.urls', 'providers'),
+ namespace='providers')),
url(r'^favorites/',
- include('funkwhale_api.favorites.urls', namespace='favorites')),
+ include(
+ ('funkwhale_api.favorites.urls', 'favorites'),
+ namespace='favorites')),
url(r'^search$',
views.Search.as_view(), name='search'),
url(r'^radios/',
- include('funkwhale_api.radios.urls', namespace='radios')),
+ include(
+ ('funkwhale_api.radios.urls', 'radios'),
+ namespace='radios')),
url(r'^history/',
- include('funkwhale_api.history.urls', namespace='history')),
+ include(
+ ('funkwhale_api.history.urls', 'history'),
+ namespace='history')),
url(r'^users/',
- include('funkwhale_api.users.api_urls', namespace='users')),
+ include(
+ ('funkwhale_api.users.api_urls', 'users'),
+ namespace='users')),
url(r'^token/',
jwt_views.obtain_jwt_token),
url(r'^token/refresh/', jwt_views.refresh_jwt_token),
]
urlpatterns = [
- url(r'^v1/', include(v1_patterns, namespace='v1'))
+ url(r'^v1/', include((v1_patterns, 'v1'), namespace='v1'))
]
diff --git a/api/config/urls.py b/api/config/urls.py
index 8764640d..8c490a5e 100644
--- a/api/config/urls.py
+++ b/api/config/urls.py
@@ -10,9 +10,9 @@ from django.views import defaults as default_views
urlpatterns = [
# Django Admin, use {% url 'admin:index' %}
- url(settings.ADMIN_URL, include(admin.site.urls)),
+ url(settings.ADMIN_URL, admin.site.urls),
- url(r'^api/', include("config.api_urls", namespace="api")),
+ url(r'^api/', include(("config.api_urls", 'api'), namespace="api")),
url(r'^api/auth/', include('rest_auth.urls')),
url(r'^api/auth/registration/', include('funkwhale_api.users.rest_auth_urls')),
url(r'^accounts/', include('allauth.urls')),
diff --git a/api/funkwhale_api/providers/urls.py b/api/funkwhale_api/providers/urls.py
index a6d417e5..10975da5 100644
--- a/api/funkwhale_api/providers/urls.py
+++ b/api/funkwhale_api/providers/urls.py
@@ -1,8 +1,11 @@
from django.conf.urls import include, url
from funkwhale_api.music import views
-
urlpatterns = [
- url(r'^youtube/', include('funkwhale_api.providers.youtube.urls', namespace='youtube')),
- url(r'^musicbrainz/', include('funkwhale_api.musicbrainz.urls', namespace='musicbrainz')),
+ url(r'^youtube/', include(
+ ('funkwhale_api.providers.youtube.urls', 'youtube'),
+ namespace='youtube')),
+ url(r'^musicbrainz/', include(
+ ('funkwhale_api.musicbrainz.urls', 'musicbrainz'),
+ namespace='musicbrainz')),
]
diff --git a/api/funkwhale_api/radios/urls.py b/api/funkwhale_api/radios/urls.py
index 57e47f06..8c31df09 100644
--- a/api/funkwhale_api/radios/urls.py
+++ b/api/funkwhale_api/radios/urls.py
@@ -6,4 +6,5 @@ router = routers.SimpleRouter()
router.register(r'sessions', views.RadioSessionViewSet, 'sessions')
router.register(r'tracks', views.RadioSessionTrackViewSet, 'tracks')
+
urlpatterns = router.urls
--
GitLab