From: Stephen Finucane <stephen@that.guru>
Date: Thu, 18 May 2017 20:17:40 +0000 (+0100)
Subject: urls: Don't "include" admin URLs
X-Git-Tag: v2.0.0-rc2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c265e0fd9588030ab8bcff1e4f27be941511aca4;p=thirdparty%2Fpatchwork.git

urls: Don't "include" admin URLs

This raises a warning in Django 1.9 and will cause an error in Django
2.0. Per the documentation [1] it is not even necessary so it can simply
be removed.

This resolves all issues with Django 1.9.

[1] https://docs.djangoproject.com/en/1.11/ref/contrib/admin/\
      #hooking-adminsite-instances-into-your-urlconf

Signed-off-by: Stephen Finucane <stephen@that.guru>
---

diff --git a/patchwork/urls.py b/patchwork/urls.py
index f700f386..1871c9a9 100644
--- a/patchwork/urls.py
+++ b/patchwork/urls.py
@@ -40,7 +40,7 @@ from patchwork.views import xmlrpc as xmlrpc_views
 admin.autodiscover()
 
 urlpatterns = [
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
 
     url(r'^$', project_views.project_list, name='project-list'),
     url(r'^project/(?P<project_id>[^/]+)/list/$', patch_views.patch_list,