From 5cf6ef57b7f24b84a6cdc59fc5292d80bb2e8d1f Mon Sep 17 00:00:00 2001
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Thu, 12 Apr 2018 15:57:45 +1200
Subject: [PATCH] urls*: Use new urlpatterns list syntax

The patterns() function is deprecated in Django 1.8 and gone in 1.10, so
we should switch over to the new list format.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 layerindex/urls.py        | 4 ++--
 layerindex/urls_branch.py | 4 ++--
 urls.py                   | 7 +++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/layerindex/urls.py b/layerindex/urls.py
index 111e505..25e11a5 100644
--- a/layerindex/urls.py
+++ b/layerindex/urls.py
@@ -27,7 +27,7 @@ router.register(r'distros', restviews.DistroViewSet)
 router.register(r'classes', restviews.ClassViewSet)
 router.register(r'layers', restviews.LayerViewSet, 'layers')
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^$',
         RedirectView.as_view(url=reverse_lazy('layer_list', args=('master',)), permanent=False),
         name='frontpage'),
@@ -147,4 +147,4 @@ urlpatterns = patterns('',
             template_name='layerindex/classicrecipedetail.html'),
             name='classic_recipe'),
     url(r'.*', page_not_found)
-)
+]
diff --git a/layerindex/urls_branch.py b/layerindex/urls_branch.py
index d451896..a71af1c 100644
--- a/layerindex/urls_branch.py
+++ b/layerindex/urls_branch.py
@@ -9,7 +9,7 @@ from django.views.defaults import page_not_found
 from django.core.urlresolvers import reverse_lazy
 from layerindex.views import LayerListView, RecipeSearchView, MachineSearchView, DistroSearchView, ClassSearchView, PlainTextListView, LayerDetailView, edit_layer_view, delete_layer_view, edit_layernote_view, delete_layernote_view, RedirectParamsView, DuplicatesView, LayerUpdateDetailView
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^$', 
         RedirectParamsView.as_view(permanent=False), {'redirect_name': 'layer_list'}),
     url(r'^layers/$',
@@ -41,4 +41,4 @@ urlpatterns = patterns('',
         DuplicatesView.as_view(
             template_name='layerindex/duplicates.html'),
             name='duplicates'),
-)
+]
diff --git a/urls.py b/urls.py
index 649635c..b13de4a 100644
--- a/urls.py
+++ b/urls.py
@@ -5,17 +5,16 @@
 # Copyright (c) Django Software Foundation and individual contributors.
 # All rights reserved.
 
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.views.generic import RedirectView
 
 from django.contrib import admin
 admin.autodiscover()
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^layerindex/', include('layerindex.urls')),
     url(r'^admin/', include(admin.site.urls)),
     url(r'^accounts/', include('registration.backends.default.urls')),
     url(r'^captcha/', include('captcha.urls')),
     url(r'.*', RedirectView.as_view(url='/layerindex/', permanent=False)),
-)
-
+]