From 27c460410144dc94f9a279c8d1bc3e66fc715229 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Mon, 21 Aug 2017 18:21:53 +0200
Subject: urls: remove pattern (not compatible with Django 1.11)

---
 archaeological_context_records/urls.py | 48 ++++++++++++++++------------------
 1 file changed, 22 insertions(+), 26 deletions(-)

(limited to 'archaeological_context_records/urls.py')

diff --git a/archaeological_context_records/urls.py b/archaeological_context_records/urls.py
index ef8dea98c..86e4c3137 100644
--- a/archaeological_context_records/urls.py
+++ b/archaeological_context_records/urls.py
@@ -17,17 +17,16 @@
 
 # See the file COPYING for details.
 
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from archaeological_context_records import models
 from ishtar_common.wizards import check_rights
-import views
+from archaeological_context_records import views
 
 # be careful: each check_rights must be relevant with ishtar_menu
 
 # forms
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     # Context records
     url(r'record_search/(?P<step>.+)?$',
         check_rights(['view_contextrecord', 'view_own_contextrecord'])(
@@ -61,50 +60,47 @@ urlpatterns = patterns(
         check_rights(['change_contextrecord', 'change_own_contextrecord'])(
             views.record_source_deletion_wizard),
         name='record_source_deletion'),
-)
-
-urlpatterns += patterns(
-    'archaeological_context_records.views',
-    url(r'autocomplete-contextrecord/$', 'autocomplete_contextrecord',
+    url(r'autocomplete-contextrecord/$', views.autocomplete_contextrecord,
         name='autocomplete-contextrecord'),
     url(r'show-contextrecord(?:/(?P<pk>.+))?/(?P<type>.+)?$',
-        'show_contextrecord', name=models.ContextRecord.SHOW_URL),
+        views.show_contextrecord, name=models.ContextRecord.SHOW_URL),
     # show-contextrecordrelation is only a view the id point to a context record
     url(r'show-contextrecord(?:/(?P<pk>.+))?/(?P<type>.+)?$',
-        'show_contextrecord', name='show-contextrecordrelation'),
+        views.show_contextrecord, name='show-contextrecordrelation'),
     url(r'show-historized-contextrecord/(?P<pk>.+)?/(?P<date>.+)?$',
-        'show_contextrecord', name='show-historized-contextrecord'),
+        views.show_contextrecord, name='show-historized-contextrecord'),
     url(r'revert-contextrecord/(?P<pk>.+)/(?P<date>.+)$',
-        'revert_contextrecord', name='revert-contextrecord'),
-    url(r'get-contextrecord/own/(?P<type>.+)?$', 'get_contextrecord',
+        views.revert_contextrecord, name='revert-contextrecord'),
+    url(r'get-contextrecord/own/(?P<type>.+)?$', views.get_contextrecord,
         name='get-own-contextrecord', kwargs={'force_own': True}),
-    url(r'get-contextrecord/(?P<type>.+)?$', 'get_contextrecord',
+    url(r'get-contextrecord/(?P<type>.+)?$', views.get_contextrecord,
         name='get-contextrecord'),
     url(r'get-contextrecord-for-ope/own/(?P<type>.+)?$',
-        'get_contextrecord_for_ope',
+        views.get_contextrecord_for_ope,
         name='get-own-contextrecord-for-ope', kwargs={'force_own': True}),
     url(r'get-contextrecord-for-ope/(?P<type>.+)?$',
-        'get_contextrecord_for_ope',
+        views.get_contextrecord_for_ope,
         name='get-contextrecord-for-ope'),
     url(r'get-contextrecord-full/own/(?P<type>.+)?$',
-        'get_contextrecord', name='get-own-contextrecord-full',
+        views.get_contextrecord, name='get-own-contextrecord-full',
         kwargs={'full': True, 'force_own': True}),
     url(r'get-contextrecord-full/(?P<type>.+)?$',
-        'get_contextrecord', name='get-contextrecord-full',
+        views.get_contextrecord, name='get-contextrecord-full',
         kwargs={'full': True}),
     url(r'get-contextrecord-shortcut/(?P<type>.+)?$',
-        'get_contextrecord', name='get-contextrecord-shortcut',
+        views.get_contextrecord, name='get-contextrecord-shortcut',
         kwargs={'full': 'shortcut'}),
     url(r'get-contextrecordrelation/(?P<type>.+)?$',
-        'get_contextrecordrelation', name='get-contextrecordrelation'),
+        views.get_contextrecordrelation, name='get-contextrecordrelation'),
     url(r'get-contextrecordrelationdetail/(?P<type>.+)?$',
-        'get_contextrecordrelationdetail',
+        views.get_contextrecordrelationdetail,
         name='get-contextrecordrelationdetail'),
     url(r'show-contextrecordsource(?:/(?P<pk>.+))?/(?P<type>.+)?$',
-        'show_contextrecordsource', name=models.ContextRecordSource.SHOW_URL),
+        views.show_contextrecordsource,
+        name=models.ContextRecordSource.SHOW_URL),
     url(r'get-contexrecordsource/(?P<type>.+)?$',
-        'get_contextrecordsource', name='get-contextrecordsource'),
+        views.get_contextrecordsource, name='get-contextrecordsource'),
     url(r'get-contexrecordsource-full/(?P<type>.+)?$',
-        'get_contextrecordsource', name='get-contextrecordsource-full',
+        views.get_contextrecordsource, name='get-contextrecordsource-full',
         kwargs={'full': True}),
-)
+]
-- 
cgit v1.2.3