urls: remove pattern (not compatible with Django 1.11)

8 files changed, 193 insertions, 225 deletions

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}),
-)
+]
diff --git a/archaeological_files/urls.py b/archaeological_files/urls.py
index 04a24d398..f00d618d6 100644
--- a/archaeological_files/urls.py
+++ b/archaeological_files/urls.py
@@ -17,16 +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
+from archaeological_files import views
+from archaeological_operations.views import administrativeactfile_document
 
 # be carreful: each check_rights must be relevant with ishtar_menu
 
 # forms:
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'file_administrativeactfil_search/(?P<step>.+)?$',
         check_rights(['change_administrativeact'])(
             views.file_administrativeactfile_search_wizard),
@@ -65,33 +65,25 @@ urlpatterns = patterns(
         check_rights(['delete_file', 'delete_own_file'])(
             views.file_deletion_wizard),
         name='file_deletion'),
-)
-
-urlpatterns += patterns(
-    'archaeological_files.views',
-    url(r'autocomplete-file/$', 'autocomplete_file',
+    url(r'autocomplete-file/$', views.autocomplete_file,
         name='autocomplete-file'),
-    url(r'get-file/(?P<type>.+)?$', 'get_file',
+    url(r'get-file/(?P<type>.+)?$', views.get_file,
         name='get-file'),
-    url(r'get-file-full/(?P<type>.+)?$', 'get_file',
+    url(r'get-file-full/(?P<type>.+)?$', views.get_file,
         name='get-file-full', kwargs={'full': True}),
     url(r'get-file-shortcut/(?P<type>.+)?$',
-        'get_file', name='get-file-shortcut',
+        views.get_file, name='get-file-shortcut',
         kwargs={'full': 'shortcut'}),
     url(r'get-administrativeactfile/(?P<type>.+)?$',
-        'get_administrativeactfile', name='get-administrativeactfile'),
-    url(r'show-file(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_file',
+        views.get_administrativeactfile, name='get-administrativeactfile'),
+    url(r'show-file(?:/(?P<pk>.+))?/(?P<type>.+)?$', views.show_file,
         name='show-file'),
     url(r'show-historized-file/(?P<pk>.+)?/(?P<date>.+)?$',
-        'show_file', name='show-historized-file'),
+        views.show_file, name='show-historized-file'),
     url(r'revert-file/(?P<pk>.+)/(?P<date>.+)$',
-        'revert_file', name='revert-file'),
-    url(r'dashboard_file/$', 'dashboard_file', name='dashboard-file'),
-)
-
-urlpatterns += patterns(
-    'archaeological_operations.views',
+        views.revert_file, name='revert-file'),
+    url(r'dashboard_file/$', views.dashboard_file, name='dashboard-file'),
     url(r'file_administrativeact_document/$',
-        'administrativeactfile_document',
+        administrativeactfile_document,
         name='file-administrativeact-document', kwargs={'file': True}),
-)
+]
diff --git a/archaeological_files_pdl/urls.py b/archaeological_files_pdl/urls.py
index 26baaeeb1..6acb6129d 100644
--- a/archaeological_files_pdl/urls.py
+++ b/archaeological_files_pdl/urls.py
@@ -17,12 +17,11 @@
 
 # See the file COPYING for details.
 
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from archaeological_files_pdl import views
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'file_creation/(?P<step>.+)?$',
         views.file_creation_wizard, name='file_creation'),
     url(r'file_modification/(?P<step>.+)?$',
@@ -33,4 +32,4 @@ urlpatterns = patterns(
     url(r'townplanning-edit/(?P<pk>\d+)$',
         views.TownPlanningEdit.as_view(),
         name='townplanning_edit'),
-)
+]
diff --git a/archaeological_finds/urls.py b/archaeological_finds/urls.py
index 78ea05e96..317afcb91 100644
--- a/archaeological_finds/urls.py
+++ b/archaeological_finds/urls.py
@@ -17,18 +17,18 @@
 
 # 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
 
+from archaeological_finds import views
+from archaeological_operations.views import administrativeactfile_document
 from archaeological_finds import models
 
 # be careful: each check_rights must be relevant with ishtar_menu
 
 # forms
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'find_search/(?P<step>.+)?$',
         check_rights(['view_find', 'view_own_find'])(
             views.find_search_wizard), name='find_search'),
@@ -197,8 +197,6 @@ urlpatterns = patterns(
         check_rights(['change_treatmentfile', 'change_own_treatmentfile'])(
             views.treatmentfile_source_deletion_wizard),
         name='treatmentfile_source_deletion'),
-
-
     url(r'^treatmentfle_search/(?P<step>.+)?$',
         check_rights(['change_find', 'change_own_find'])(
             views.treatmentfile_search_wizard),
@@ -225,94 +223,89 @@ urlpatterns = patterns(
     url(r'get-downstreamtreatment/(?P<type>.+)?$',
         views.get_downstreamtreatment,
         name='get-downstreamtreatment'),
-)
-
-urlpatterns += patterns(
-    'archaeological_finds.views',
-    url(r'autocomplete-objecttype/$', 'autocomplete_objecttype',
+    url(r'autocomplete-objecttype/$', views.autocomplete_objecttype,
         name='autocomplete-objecttype'),
-    url(r'autocomplete-materialtype/$', 'autocomplete_materialtype',
+    url(r'autocomplete-materialtype/$', views.autocomplete_materialtype,
         name='autocomplete-materialtype'),
-    url(r'autocomplete-preservationtype/$', 'autocomplete_preservationtype',
+    url(r'autocomplete-preservationtype/$', views.autocomplete_preservationtype,
         name='autocomplete-preservationtype'),
-    url(r'autocomplete-integritytype/$', 'autocomplete_integritytype',
+    url(r'autocomplete-integritytype/$', views.autocomplete_integritytype,
         name='autocomplete-integritytype'),
-    url(r'autocomplete-treatmentfile/$', 'autocomplete_treatmentfile',
+    url(r'autocomplete-treatmentfile/$', views.autocomplete_treatmentfile,
         name='autocomplete-treatmentfile'),
-    url(r'get-find/own/(?P<type>.+)?$', 'get_find',
+    url(r'get-find/own/(?P<type>.+)?$', views.get_find,
         name='get-own-find', kwargs={'force_own': True}),
-    url(r'get-find/(?P<type>.+)?$', 'get_find',
+    url(r'get-find/(?P<type>.+)?$', views.get_find,
         name='get-find'),
-    url(r'get-find-for-ope/own/(?P<type>.+)?$', 'get_find_for_ope',
+    url(r'get-find-for-ope/own/(?P<type>.+)?$', views.get_find_for_ope,
         name='get-own-find-for-ope', kwargs={'force_own': True}),
-    url(r'get-find-for-ope/(?P<type>.+)?$', 'get_find_for_ope',
+    url(r'get-find-for-ope/(?P<type>.+)?$', views.get_find_for_ope,
         name='get-find-for-ope'),
-    url(r'get-find-for-treatment/own/(?P<type>.+)?$', 'get_find_for_treatment',
+    url(r'get-find-for-treatment/own/(?P<type>.+)?$',
+        views.get_find_for_treatment,
         name='get-own-find-for-treatment', kwargs={'force_own': True}),
-    url(r'get-find-for-treatment/(?P<type>.+)?$', 'get_find_for_treatment',
+    url(r'get-find-for-treatment/(?P<type>.+)?$', views.get_find_for_treatment,
         name='get-find-for-treatment'),
-    url(r'get-find-full/own/(?P<type>.+)?$', 'get_find',
+    url(r'get-find-full/own/(?P<type>.+)?$', views.get_find,
         name='get-own-find-full', kwargs={'full': True, 'force_own': True}),
-    url(r'get-find-full/(?P<type>.+)?$', 'get_find',
+    url(r'get-find-full/(?P<type>.+)?$', views.get_find,
         name='get-find-full', kwargs={'full': True}),
     url(r'get-find-shortcut/(?P<type>.+)?$',
-        'get_find', name='get-find-shortcut',
+        views.get_find, name='get-find-shortcut',
         kwargs={'full': 'shortcut'}),
     url(r'get-findsource/(?P<type>.+)?$',
-        'get_findsource', name='get-findsource'),
+        views.get_findsource, name='get-findsource'),
     url(r'get-findsource-full/(?P<type>.+)?$',
-        'get_findsource', name='get-findsource-full',
+        views.get_findsource, name='get-findsource-full',
         kwargs={'full': True}),
-    url(r'^show-findsource(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_findsource',
+    url(r'^show-findsource(?:/(?P<pk>.+))?/(?P<type>.+)?$',
+        views.show_findsource,
         name=models.FindSource.SHOW_URL),
-    url(r'^show-find/basket-(?P<pk>.+)/(?P<type>.+)?$', 'show_findbasket',
+    url(r'^show-find/basket-(?P<pk>.+)/(?P<type>.+)?$', views.show_findbasket,
         name='show-findbasket'),
-    url(r'^display-find/basket-(?P<pk>.+)/$', 'display_findbasket',
+    url(r'^display-find/basket-(?P<pk>.+)/$', views.display_findbasket,
         name='display-findbasket'),
-    url(r'^show-find(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_find',
+    url(r'^show-find(?:/(?P<pk>.+))?/(?P<type>.+)?$', views.show_find,
         name=models.Find.SHOW_URL),
-    url(r'^display-find/(?P<pk>.+)/$', 'display_find',
+    url(r'^display-find/(?P<pk>.+)/$', views.display_find,
         name='display-' + models.Find.SLUG),
     url(r'^show-historized-find/(?P<pk>.+)?/(?P<date>.+)?$',
-        'show_find', name='show-historized-find'),
+        views.show_find, name='show-historized-find'),
     url(r'^revert-find/(?P<pk>.+)/(?P<date>.+)$',
-        'revert_find', name='revert-find'),
+        views.revert_find, name='revert-find'),
     url(r'^get-treatment/(?P<type>.+)?$',
-        'get_treatment', name='get-treatment'),
+        views.get_treatment, name='get-treatment'),
     url(r'get-treatment-shortcut/(?P<type>.+)?$',
-        'get_treatment', name='get-treatment-shortcut',
+        views.get_treatment, name='get-treatment-shortcut',
         kwargs={'full': 'shortcut'}),
-    url(r'^show-treatment(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_treatment',
+    url(r'^show-treatment(?:/(?P<pk>.+))?/(?P<type>.+)?$', views.show_treatment,
         name=models.Treatment.SHOW_URL),
     url(r'show-historized-treatment/(?P<pk>.+)?/(?P<date>.+)?$',
-        'show_treatment', name='show-historized-treatment'),
+        views.show_treatment, name='show-historized-treatment'),
     url(r'^revert-treatment/(?P<pk>.+)/(?P<date>.+)$',
-        'revert_treatment', name='revert-treatment'),
+        views.revert_treatment, name='revert-treatment'),
     url(r'get-treatmentfile/(?P<type>.+)?$',
-        'get_treatmentfile', name='get-treatmentfile'),
+        views.get_treatmentfile, name='get-treatmentfile'),
     url(r'get-treatmentfile-shortcut/(?P<type>.+)?$',
-        'get_treatmentfile', name='get-treatmentfile-shortcut',
+        views.get_treatmentfile, name='get-treatmentfile-shortcut',
         kwargs={'full': 'shortcut'}),
     url(r'^show-treatmentfile(?:/(?P<pk>.+))?/(?P<type>.+)?$',
-        'show_treatmentfile',
+        views.show_treatmentfile,
         name=models.TreatmentFile.SHOW_URL),
     url(r'show-historized-treatmentfile/(?P<pk>.+)?/(?P<date>.+)?$',
-        'show_treatmentfile', name='show-historized-treatmentfile'),
+        views.show_treatmentfile, name='show-historized-treatmentfile'),
     url(r'^revert-treatmentfile/(?P<pk>.+)/(?P<date>.+)$',
-        'revert_treatmentfile', name='revert-treatmentfile'),
-    # url(r'show-treatmentfile(?:/(?P<pk>.+))?/(?P<type>.+)?$',
-    # 'show_treatmentfile',
-    #     name=models.TreatmentFile.SHOW_URL),
-)
-
-urlpatterns += patterns(
-    'archaeological_operations.views',
+        views.revert_treatmentfile, name='revert-treatmentfile'),
     url(r'^treatment_administrativeact_document/$',
-        'administrativeactfile_document',
+        administrativeactfile_document,
         name='treatment-administrativeact-document',
         kwargs={'treatment': True}),
     url(r'^treatmentfle_administrativeact_document/$',
-        'administrativeactfile_document',
+        administrativeactfile_document,
         name='treatmentfle-administrativeact-document',
         kwargs={'treatment_file': True}),
-)
+]
+
+# url(r'show-treatmentfile(?:/(?P<pk>.+))?/(?P<type>.+)?$',
+# 'show_treatmentfile',
+#     name=models.TreatmentFile.SHOW_URL),
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'),
-)
+]
diff --git a/archaeological_warehouse/urls.py b/archaeological_warehouse/urls.py
index 2ef3c8e58..5be9183d2 100644
--- a/archaeological_warehouse/urls.py
+++ b/archaeological_warehouse/urls.py
@@ -17,38 +17,35 @@
 
 # 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
+from archaeological_warehouse import views
+
 from archaeological_warehouse import models
 
 # be careful: each check_rights must be relevant with ishtar_menu
 
 # forms
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'warehouse_packaging/(?P<step>.+)?$',
         views.warehouse_packaging_wizard, name='warehouse_packaging'),
-)
 
-urlpatterns += patterns(
-    'archaeological_warehouse.views',
     url(r'new-warehouse/(?P<parent_name>.+)?/$',
-        'new_warehouse', name='new-warehouse'),
-    url(r'^show-warehouse(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_warehouse',
+        views.new_warehouse, name='new-warehouse'),
+    url(r'^show-warehouse(?:/(?P<pk>.+))?/(?P<type>.+)?$', views.show_warehouse,
         name=models.Warehouse.SHOW_URL),
-    url(r'autocomplete-warehouse/$', 'autocomplete_warehouse',
+    url(r'autocomplete-warehouse/$', views.autocomplete_warehouse,
         name='autocomplete-warehouse'),
     url(r'new-container/(?P<parent_name>.+)?/$',
-        'new_container', name='new-container'),
-    url(r'get-container/(?P<type>.+)?$', 'get_container',
+        views.new_container, name='new-container'),
+    url(r'get-container/(?P<type>.+)?$', views.get_container,
         name='get-container'),
-    url(r'get-warehouse/(?P<type>.+)?$', 'get_warehouse',
+    url(r'get-warehouse/(?P<type>.+)?$', views.get_warehouse,
         name='get-warehouse'),
     url(r'autocomplete-container/?$',
-        'autocomplete_container', name='autocomplete-container'),
-    url(r'^show-container(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_container',
+        views.autocomplete_container, name='autocomplete-container'),
+    url(r'^show-container(?:/(?P<pk>.+))?/(?P<type>.+)?$', views.show_container,
         name=models.Container.SHOW_URL),
     url(r'^warehouse_search/(?P<step>.+)?$',
         check_rights(['view_warehouse', 'view_own_warehouse'])(
@@ -85,4 +82,4 @@ urlpatterns += patterns(
         name='container_deletion'),
     url(r'container-modify/(?P<pk>.+)/$',
         views.container_modify, name='container_modify'),
-)
\ No newline at end of file
+]
\ No newline at end of file
diff --git a/example_project/urls.py b/example_project/urls.py
index 1b8d00901..9e2439a01 100644
--- a/example_project/urls.py
+++ b/example_project/urls.py
@@ -1,44 +1,39 @@
 from django.conf import settings
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 
 from django.contrib import admin
 from ishtar_common.apps import admin_site
 from ajax_select import urls as ajax_select_urls
 
+from ishtar_common.views import index
+
 admin.autodiscover()
 
 
-urlpatterns = patterns(
-    '', (r'^accounts/', include('registration.urls')),
-)
+urlpatterns = [
+    url(r'^accounts/', include('registration.urls')),
+
+]
 
 APP_LIST = ['archaeological_files_pdl', 'archaeological_files',
             'archaeological_operations', 'archaeological_context_records',
             'archaeological_warehouse', 'archaeological_finds']
 for app in APP_LIST:
-    # filter by activated apps?
-    urlpatterns += patterns(
-        '', ('', include(app + '.urls')),
-    )
-
-urlpatterns += patterns(
-    '', ('', include('ishtar_common.urls')),
-)
-
-urlpatterns += patterns(
-    'ishtar_common.views', url(r'^$', 'index', name='start'),
-)
-
-urlpatterns += patterns(
-    '', (r'^admin/', include(admin_site.urls)),
-)
+    urlpatterns += [
+        url('', include(app + '.urls')),
+    ]
 
-urlpatterns += patterns(
-    '', (r'^ajax-select/', include(ajax_select_urls)),
-)
+urlpatterns += [
+    url(r'^admin/', include(admin_site.urls)),
+    url(r'^ajax-select/', include(ajax_select_urls)),
+    url(r'', include('ishtar_common.urls')),
+    url(r'^$', index, name='start'),
+]
 
 if settings.DEBUG:
     # static files (images, css, javascript, etc.)
-    urlpatterns += patterns(
-        '', (r'^media/(?P<path>.*)$', 'django.views.static.serve',
-             {'document_root': settings.MEDIA_ROOT}))
+    from django.views.static import serve
+    urlpatterns += [
+        url(r'^media/(?P<path>.*)$', serve,
+            {'document_root': settings.MEDIA_ROOT})
+    ]
diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py
index 163fedeb9..ce3386363 100644
--- a/ishtar_common/urls.py
+++ b/ishtar_common/urls.py
@@ -18,7 +18,7 @@
 # See the file COPYING for details.
 
 from django.conf import settings
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.conf.urls.static import static
 from django.views.generic import TemplateView
 
@@ -30,8 +30,7 @@ from ishtar_common.wizards import check_rights
 # be careful: each check_rights must be relevant with ishtar_menu
 
 # forms
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^status/$', views.status, name='status'),
     url(r'^robots\.txt$', TemplateView.as_view(template_name='robots.txt',
                                                content_type='text/plain')),
@@ -114,7 +113,7 @@ urlpatterns = patterns(
         views.ImportDeleteView.as_view(), name='import_delete'),
     url(r'^import-link-unmatched/(?P<pk>[0-9]+)/$',
         views.ImportLinkView.as_view(), name='import_link_unmatched'),
-)
+]
 
 actions = []
 for section in menu.childs:
@@ -127,62 +126,61 @@ for section in menu.childs:
 actions = r"|".join(actions)
 
 # other views
-urlpatterns += patterns(
-    'ishtar_common.views',
+urlpatterns += [
     # General
-    url(r'dashboard-main/$', 'dashboard_main',
+    url(r'dashboard-main/$', views.dashboard_main,
         name='dashboard-main'),
-    url(r'dashboard-main/(?P<item_name>[a-z-]+)/$', 'dashboard_main_detail',
+    url(r'dashboard-main/(?P<item_name>[a-z-]+)/$', views.dashboard_main_detail,
         name='dashboard-main-detail'),
-    url(r'update-current-item/$', 'update_current_item',
+    url(r'update-current-item/$', views.update_current_item,
         name='update-current-item'),
-    url(r'pin/(?P<item_type>[a-z-]+)/(?P<pk>\d+)/$', 'update_current_item',
+    url(r'pin/(?P<item_type>[a-z-]+)/(?P<pk>\d+)/$', views.update_current_item,
         name='pin'),
-    url(r'unpin/(?P<item_type>[a-z-]+)/$', 'unpin', name='unpin'),
+    url(r'unpin/(?P<item_type>[a-z-]+)/$', views.unpin, name='unpin'),
     url(r'get-by-importer/(?P<slug>[\w-]+)/(?P<type>[a-z-]+)?$',
-        'get_by_importer', name='get-by-importer'),
+        views.get_by_importer, name='get-by-importer'),
     url(r'new-person/(?:(?P<parent_name>[^/]+)/)?(?:(?P<limits>[^/]+)/)?$',
-        'new_person', name='new-person'),
+        views.new_person, name='new-person'),
     url(r'new-person-noorga/'
         r'(?:(?P<parent_name>[^/]+)/)?(?:(?P<limits>[^/]+)/)?$',
-        'new_person_noorga', name='new-person-noorga'),
+        views.new_person_noorga, name='new-person-noorga'),
     url(r'autocomplete-person(?:/([0-9_]+))?(?:/([0-9_]*))?/(user)?$',
-        'autocomplete_person', name='autocomplete-person'),
+        views.autocomplete_person, name='autocomplete-person'),
     url(r'autocomplete-person-permissive(?:/([0-9_]+))?(?:/([0-9_]*))?'
-        r'/(user)?$', 'autocomplete_person_permissive',
+        r'/(user)?$', views.autocomplete_person_permissive,
         name='autocomplete-person-permissive'),
-    url(r'get-person/(?P<type>.+)?$', 'get_person',
+    url(r'get-person/(?P<type>.+)?$', views.get_person,
         name='get-person'),
-    url(r'get-person-full/(?P<type>.+)?$', 'get_person',
+    url(r'get-person-full/(?P<type>.+)?$', views.get_person,
         name='get-person-full', kwargs={'full': True}),
     url(r'show-person(?:/(?P<pk>.+))?/(?P<type>.+)?$',
-        'show_person', name='show-person'),
-    url(r'department-by-state/(?P<state_id>.+)?$', 'department_by_state',
+        views.show_person, name='show-person'),
+    url(r'department-by-state/(?P<state_id>.+)?$', views.department_by_state,
         name='department-by-state'),
-    url(r'autocomplete-town/?$', 'autocomplete_town',
+    url(r'autocomplete-town/?$', views.autocomplete_town,
         name='autocomplete-town'),
     url(r'autocomplete-advanced-town/(?P<department_id>[0-9]+[ABab]?)?$',
-        'autocomplete_advanced_town', name='autocomplete-advanced-town'),
-    url(r'autocomplete-department/?$', 'autocomplete_department',
+        views.autocomplete_advanced_town, name='autocomplete-advanced-town'),
+    url(r'autocomplete-department/?$', views.autocomplete_department,
         name='autocomplete-department'),
     url(r'new-author/(?:(?P<parent_name>[^/]+)/)?(?:(?P<limits>[^/]+)/)?$',
-        'new_author', name='new-author'),
-    url(r'autocomplete-author/$', 'autocomplete_author',
+        views.new_author, name='new-author'),
+    url(r'autocomplete-author/$', views.autocomplete_author,
         name='autocomplete-author'),
     url(r'new-organization/(?:(?P<parent_name>[^/]+)/)?'
         r'(?:(?P<limits>[^/]+)/)?$',
-        'new_organization', name='new-organization'),
-    url(r'get-organization/(?P<type>.+)?$', 'get_organization',
+        views.new_organization, name='new-organization'),
+    url(r'get-organization/(?P<type>.+)?$', views.get_organization,
         name='get-organization'),
-    url(r'get-organization-full/(?P<type>.+)?$', 'get_organization',
+    url(r'get-organization-full/(?P<type>.+)?$', views.get_organization,
         name='get-organization-full', kwargs={'full': True}),
     url(r'show-organization(?:/(?P<pk>.+))?/(?P<type>.+)?$',
-        'show_organization', name='show-organization'),
+        views.show_organization, name='show-organization'),
     url(r'autocomplete-organization/([0-9_]+)?$',
-        'autocomplete_organization', name='autocomplete-organization'),
+        views.autocomplete_organization, name='autocomplete-organization'),
     url(r'admin-globalvar/', views.GlobalVarEdit.as_view(),
         name='admin-globalvar'),
-    url(r'person-merge/(?:(?P<page>\d+)/)?$', 'person_merge',
+    url(r'person-merge/(?:(?P<page>\d+)/)?$', views.person_merge,
         name='person_merge'),
     url(r'person-manual-merge/$',
         views.PersonManualMerge.as_view(),
@@ -190,28 +188,28 @@ urlpatterns += patterns(
     url(r'person-manual-merge-items/(?P<pks>[0-9_]+?)/$',
         views.PersonManualMergeItems.as_view(),
         name='person_manual_merge_items'),
-    url(r'organization-merge/(?:(?P<page>\d+)/)?$', 'organization_merge',
+    url(r'organization-merge/(?:(?P<page>\d+)/)?$', views.organization_merge,
         name='organization_merge'),
     url(r'orga-manual-merge/$', views.OrgaManualMerge.as_view(),
         name='orga_manual_merge'),
     url(r'orga-manual-merge-items/(?P<pks>[0-9_]+?)/$',
         views.OrgaManualMergeItems.as_view(),
         name='orga_manual_merge_items'),
-    url(r'reset/$', 'reset_wizards', name='reset_wizards'),
-    url(r'activate-all-search/$', 'activate_all_search',
+    url(r'reset/$', views.reset_wizards, name='reset_wizards'),
+    url(r'activate-all-search/$', views.activate_all_search,
         name='activate-all-search'),
-    url(r'activate-own-search/$', 'activate_own_search',
+    url(r'activate-own-search/$', views.activate_own_search,
         name='activate-own-search'),
-    url(r'activate-advanced-menu/$', 'activate_advanced_shortcut_menu',
+    url(r'activate-advanced-menu/$', views.activate_advanced_shortcut_menu,
         name='activate-advanced-menu'),
-    url(r'activate-simple-menu/$', 'activate_simple_shortcut_menu',
+    url(r'activate-simple-menu/$', views.activate_simple_shortcut_menu,
         name='activate-simple-menu'),
-    url(r'hide-shortcut-menu/$', 'hide_shortcut_menu',
+    url(r'hide-shortcut-menu/$', views.hide_shortcut_menu,
         name='hide-shortcut-menu'),
-    url(r'show-shortcut-menu/$', 'show_shortcut_menu',
+    url(r'show-shortcut-menu/$', views.show_shortcut_menu,
         name='show-shortcut-menu'),
-    url(r'(?P<action_slug>' + actions + r')/$', 'action', name='action'),
-)
+    url(r'(?P<action_slug>' + actions + r')/$', views.action, name='action'),
+]
 
 if settings.DEBUG:
     urlpatterns += static(settings.STATIC_URL,