From bfc48c028e3844912e0676de9bb90b67bd1eb78b Mon Sep 17 00:00:00 2001
From: winkidney <winkidney@gmail.com>
Date: Fri, 10 Jul 2020 21:01:54 +0800
Subject: [PATCH] Fix: try to fix urls

---
 pinry/urls.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pinry/urls.py b/pinry/urls.py
index aae9654..7293b80 100644
--- a/pinry/urls.py
+++ b/pinry/urls.py
@@ -1,8 +1,8 @@
 from django.conf import settings
-from django.conf.urls import include, url
+from django.conf.urls.static import static
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from django.contrib import admin
-from django.views.static import serve
+from django.urls import path, include
 from rest_framework.documentation import include_docs_urls
 
 from core.views import drf_router
@@ -13,21 +13,19 @@ admin.autodiscover()
 
 urlpatterns = [
     # drf api
-    url(r'^api/v2/', include(drf_router.urls)),
-    url(r'^api-auth/', include('rest_framework.urls', namespace="rest_framework")),
-    url(r'^api/v2/docs/', include_docs_urls(title='PinryAPI', schema_url='/')),
+    path('api/v2/', include(drf_router.urls)),
+    path('api-auth/', include('rest_framework.urls', namespace="rest_framework")),
+    path('api/v2/docs/', include_docs_urls(title='PinryAPI', schema_url='/')),
 
     # old api and views
-    url(r'^admin/', include(admin.site.urls)),
-    url(r'^api/v2/profile/', include('users.urls', namespace='users')),
+    path(r'admin/', include(admin.site.urls, namespace="admin")),
+    path(r'api/v2/profile/', include('users.urls', namespace='users')),
 ]
 
 
 if settings.DEBUG:
     urlpatterns += staticfiles_urlpatterns()
-    urlpatterns += [
-        url(r'^media/(?P<path>.*)$', serve, {'document_root': settings.MEDIA_ROOT, }),
-    ]
+    urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 if settings.IS_TEST:
     urlpatterns += staticfiles_urlpatterns()