urls: remove pattern (not compatible with Django 1.11)

1 files changed, 34 insertions, 36 deletions

diff --git a/archaeological_operations/urls.py b/archaeological_operations/urls.py
index 0b4c02a61..08687ae14 100644
--- a/archaeological_operations/urls.py
+++ b/archaeological_operations/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 ishtar_common.wizards import check_rights
-import views
-import models
+from archaeological_operations import views
+from archaeological_operations import models
 
 # be carreful: each check_rights must be relevant with ishtar_menu
 
 # forms
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'operation_administrativeactop_search/(?P<step>.+)?$',
         check_rights(['change_administrativeact'])(
             views.operation_administrativeactop_search_wizard),
@@ -90,73 +89,72 @@ urlpatterns = patterns(
         check_rights(['view_administrativeact', 'view_own_administrativeact'])(
             views.administrativact_register_wizard),
         name='administrativact_register'),
-)
 
-urlpatterns += patterns(
-    'archaeological_operations.views',
-    url(r'autocomplete-operation/$', 'autocomplete_operation',
+    url(r'autocomplete-operation/$', views.autocomplete_operation,
         name='autocomplete-operation'),
     url(r'get-operation/own/(?P<type>.+)?$',
-        'get_operation', name='get-own-operation',
+        views.get_operation, name='get-own-operation',
         kwargs={'force_own': True}),
-    url(r'get-operation/(?P<type>.+)?$', 'get_operation',
+    url(r'get-operation/(?P<type>.+)?$', views.get_operation,
         name='get-operation'),
     url(r'get-operation-full/own/(?P<type>.+)?$',
-        'get_operation', name='get-own-operation-full',
+        views.get_operation, name='get-own-operation-full',
         kwargs={'full': True, 'force_own': True}),
-    url(r'get-operation-full/(?P<type>.+)?$', 'get_operation',
+    url(r'get-operation-full/(?P<type>.+)?$', views.get_operation,
         name='get-operation-full', kwargs={'full': True}),
     url(r'get-operation-shortcut/(?P<type>.+)?$',
-        'get_operation', name='get-operation-shortcut',
+        views.get_operation, name='get-operation-shortcut',
         kwargs={'full': 'shortcut'}),
     url(r'get-available-operation-code/(?P<year>.+)?$',
-        'get_available_operation_code', name='get_available_operation_code'),
+        views.get_available_operation_code,
+        name='get_available_operation_code'),
     url(r'revert-operation/(?P<pk>.+)/(?P<date>.+)$',
-        'revert_operation', name='revert-operation'),
+        views.revert_operation, name='revert-operation'),
     url(r'show-operation(?:/(?P<pk>.+))?/(?P<type>.+)?$',
-        'show_operation', name=models.Operation.SHOW_URL),
+        views.show_operation, name=models.Operation.SHOW_URL),
     url(r'show-historized-operation/(?P<pk>.+)?/(?P<date>.+)?$',
-        'show_operation', name='show-historized-operation'),
+        views.show_operation, name='show-historized-operation'),
     url(r'get-administrativeactop/(?P<type>.+)?$',
-        'get_administrativeactop', name='get-administrativeactop'),
+        views.get_administrativeactop, name='get-administrativeactop'),
     url(r'get-administrativeact/(?P<type>.+)?$',
-        'get_administrativeact', name='get-administrativeact'),
+        views.get_administrativeact, name='get-administrativeact'),
     url(r'get-administrativeact-full/(?P<type>.+)?$',
-        'get_administrativeact', name='get-administrativeact-full',
+        views.get_administrativeact, name='get-administrativeact-full',
         kwargs={'full': True}),
     url(r'show-administrativeact(?:/(?P<pk>.+))?/(?P<type>.+)?$',
-        'show_administrativeact', name='show-administrativeact'),
+        views.show_administrativeact, name='show-administrativeact'),
     # allow specialization for operations
     url(r'show-administrativeact(?:/(?P<pk>.+))?/(?P<type>.+)?$',
-        'show_administrativeact', name='show-administrativeactop'),
+        views.show_administrativeact, name='show-administrativeactop'),
     # allow specialization for files, treatment, treatment request
     url(r'show-administrativeact(?:/(?P<pk>.+))?/(?P<type>.+)?$',
-        'show_administrativeact', name='show-administrativeactfile'),
+        views.show_administrativeact, name='show-administrativeactfile'),
     url(r'show-administrativeact(?:/(?P<pk>.+))?/(?P<type>.+)?$',
-        'show_administrativeact', name='show-administrativeacttreatment'),
+        views.show_administrativeact, name='show-administrativeacttreatment'),
     url(r'show-administrativeact(?:/(?P<pk>.+))?/(?P<type>.+)?$',
-        'show_administrativeact', name='show-administrativeacttreatmentfile'),
+        views.show_administrativeact,
+        name='show-administrativeacttreatmentfile'),
     url(r'generatedoc-administrativeactop/(?P<pk>.+)?/(?P<template_pk>.+)?$',
-        'generatedoc_administrativeactop',
+        views.generatedoc_administrativeactop,
         name='generatedoc-administrativeactop'),
     url(r'show-operationsource(?:/(?P<pk>.+))?/(?P<type>.+)?$',
-        'show_operationsource', name=models.OperationSource.SHOW_URL),
+        views.show_operationsource, name=models.OperationSource.SHOW_URL),
     url(r'get-operationsource/(?P<type>.+)?$',
-        'get_operationsource', name='get-operationsource'),
+        views.get_operationsource, name='get-operationsource'),
     url(r'get-operationsource-full/(?P<type>.+)?$',
-        'get_operationsource', name='get-operationsource-full',
+        views.get_operationsource, name='get-operationsource-full',
         kwargs={'full': True}),
-    url(r'dashboard_operation/$', 'dashboard_operation',
+    url(r'dashboard_operation/$', views.dashboard_operation,
         name='dashboard-operation'),
     url(r'autocomplete-archaeologicalsite/$',
-        'autocomplete_archaeologicalsite',
+        views.autocomplete_archaeologicalsite,
         name='autocomplete-archaeologicalsite'),
     url(r'new-archaeologicalsite/(?:(?P<parent_name>[^/]+)/)?'
         r'(?:(?P<limits>[^/]+)/)?$',
-        'new_archaeologicalsite', name='new-archaeologicalsite'),
-    url(r'autocomplete-patriarche/$', 'autocomplete_patriarche',
+        views.new_archaeologicalsite, name='new-archaeologicalsite'),
+    url(r'autocomplete-patriarche/$', views.autocomplete_patriarche,
         name='autocomplete-patriarche'),
     url(r'operation_administrativeact_document/$',
-        'administrativeactfile_document',
+        views.administrativeactfile_document,
         name='operation-administrativeact-document'),
-)
+]