urls: remove pattern (not compatible with Django 1.11)

1 files changed, 39 insertions, 41 deletions

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,