diff --git a/zoo/urls.py b/zoo/urls.py
index 2521604..9e435fb 100644
--- a/zoo/urls.py
+++ b/zoo/urls.py
@@ -14,30 +14,15 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see .
-"""zoo URL Configuration
-
-The `urlpatterns` list routes URLs to views. For more information please see:
- https://docs.djangoproject.com/en/1.10/topics/http/urls/
-Examples:
-Function views
- 1. Add an import: from my_app import views
- 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home')
-Class-based views
- 1. Add an import: from other_app.views import Home
- 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home')
-Including another URLconf
- 1. Import the include() function: from django.conf.urls import url, include
- 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls'))
-"""
-from django.conf.urls import url, include
+from django.urls import re_path, include
from django.contrib import admin
from .views import login, logout
urlpatterns = [
- url(r'^admin/', admin.site.urls),
- url(r'^demo/', include('zoo.zoo_demo.urls')),
- url(r'^rsu/', include('zoo.zoo_nanterre.urls')),
- url(r'^logout/$', logout, name='logout'),
- url(r'^login/$', login, name='auth_login'),
+ re_path(r'^admin/', admin.site.urls),
+ re_path(r'^demo/', include('zoo.zoo_demo.urls')),
+ re_path(r'^rsu/', include('zoo.zoo_nanterre.urls')),
+ re_path(r'^logout/$', logout, name='logout'),
+ re_path(r'^login/$', login, name='auth_login'),
]
diff --git a/zoo/zoo_demo/urls.py b/zoo/zoo_demo/urls.py
index e2afad8..f812b23 100644
--- a/zoo/zoo_demo/urls.py
+++ b/zoo/zoo_demo/urls.py
@@ -14,11 +14,11 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see .
-from django.conf.urls import url
+from django.urls import re_path
from .views import schemas, schema
urlpatterns = [
- url(r'^schemas/$', schemas, name='demo-schemas'),
- url(r'^schemas/(?P\w*)/$', schema, name='demo-schema'),
+ re_path(r'^schemas/$', schemas, name='demo-schemas'),
+ re_path(r'^schemas/(?P\w*)/$', schema, name='demo-schema'),
]
diff --git a/zoo/zoo_nanterre/apps.py b/zoo/zoo_nanterre/apps.py
index 69cc22a..854e785 100644
--- a/zoo/zoo_nanterre/apps.py
+++ b/zoo/zoo_nanterre/apps.py
@@ -19,7 +19,7 @@
import functools
from django.apps import AppConfig
-from django.conf.urls import url
+from django.urls import re_path
from django.utils.translation import gettext_lazy as _
from django.db.models.signals import post_migrate
@@ -93,14 +93,14 @@ class ZooNanterreConfig(AppConfig):
urls = []
for desc in descs:
- urls.append(url(
+ urls.append(re_path(
r'^synchronize-federations/%s$' % desc['re'],
model_admin.admin_site.admin_view(
getattr(views, 'synchronize_federations' + desc['view'])),
kwargs={'model_admin': model_admin},
name='synchronize-federations' + desc['name'],
))
- urls.append(url(
+ urls.append(re_path(
r'^inactive/',
model_admin.admin_site.admin_view(
getattr(views, 'inactive_index')),
diff --git a/zoo/zoo_nanterre/urls.py b/zoo/zoo_nanterre/urls.py
index a212105..2994510 100644
--- a/zoo/zoo_nanterre/urls.py
+++ b/zoo/zoo_nanterre/urls.py
@@ -14,74 +14,74 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see .
-from django.conf.urls import url
+from django.urls import re_path
from .views import demo, search, import_control
from . import api_views
urlpatterns = [
- url(r'^demo/$', demo, name='demo'),
- url(r'^demo/search/$', search, name='demo'),
- url(r'^import_control/$', import_control, name='demo'),
- url(r'^search/$', api_views.search, name='rsu-api-search'),
- url(r'^individu/(?P[-\w]+)/$', api_views.reseau, name='rsu-api-reseau'),
- url(r'^individu/(?P[-\w]+)/suppression/$', api_views.suppression_individu,
+ re_path(r'^demo/$', demo, name='demo'),
+ re_path(r'^demo/search/$', search, name='demo'),
+ re_path(r'^import_control/$', import_control, name='demo'),
+ re_path(r'^search/$', api_views.search, name='rsu-api-search'),
+ re_path(r'^individu/(?P[-\w]+)/$', api_views.reseau, name='rsu-api-reseau'),
+ re_path(r'^individu/(?P[-\w]+)/suppression/$', api_views.suppression_individu,
name='rsu-api-suppression-individu'),
- url(r'^individu/(?P[-\w]+)/liste/$', api_views.reseau_liste,
+ re_path(r'^individu/(?P[-\w]+)/liste/$', api_views.reseau_liste,
name='rsu-api-reseau-liste'),
- url(r'^individu/(?P[-\w]+)/journal/$', api_views.journal, name='rsu-api-journal'),
- url(r'^individu/(?P[-\w]+)/declaration-responsabilite-legale/$',
+ re_path(r'^individu/(?P[-\w]+)/journal/$', api_views.journal, name='rsu-api-journal'),
+ re_path(r'^individu/(?P[-\w]+)/declaration-responsabilite-legale/$',
api_views.declaration_responsabilite_legale,
name='rsu-api-declaration-responsabilite-legale'),
- url(r'^individu/(?P[-\w]+)/declaration-adresse-principale/$',
+ re_path(r'^individu/(?P[-\w]+)/declaration-adresse-principale/$',
api_views.declaration_adresse_principale,
name='rsu-api-declaration-adresse-principale'),
- url(r'^individu/(?P[-\w]+)/changement-de-situation-maritale/$',
+ re_path(r'^individu/(?P[-\w]+)/changement-de-situation-maritale/$',
api_views.changement_de_situation_maritale,
name='rsu-api-changement-de-situation-maritale'),
- url(r'^individu/(?P[-\w]+)/separation/$',
+ re_path(r'^individu/(?P[-\w]+)/separation/$',
api_views.separation, name='rsu-api-separation'),
- url(r'^individu/(?P[-\w]+)/declaration-de-deces/$',
+ re_path(r'^individu/(?P[-\w]+)/declaration-de-deces/$',
api_views.declaration_de_deces, name='rsu-api-declaration-de-deces'),
- url(r'^individu/(?P[-\w]+)/(?P[-\w]+)/'
+ re_path(r'^individu/(?P[-\w]+)/(?P[-\w]+)/'
'suppression-lien-de-responsabilite/$',
api_views.suppression_lien_de_responsabilite,
name='rsu-api-suppression-lien-de-responsabilite'),
- url(r'^individu/$', api_views.create_individu, name='rsu-api-create-individu'),
- url(r'^individu/(?P[-\w]+)/federation/(?P\w+)/$', api_views.federation,
+ re_path(r'^individu/$', api_views.create_individu, name='rsu-api-create-individu'),
+ re_path(r'^individu/(?P[-\w]+)/federation/(?P\w+)/$', api_views.federation,
name='rsu-api-federation'),
- url(r'^declaration-union/$', api_views.declaration_union,
+ re_path(r'^declaration-union/$', api_views.declaration_union,
name='rsu-api-declaration-union'),
- url(r'^synchronisation/$', api_views.synchronization,
+ re_path(r'^synchronisation/$', api_views.synchronization,
name='rsu-api-synchronization'),
- url(r'^saga/retour-asynchrone/$', api_views.saga_retour_asynchrone,
+ re_path(r'^saga/retour-asynchrone/$', api_views.saga_retour_asynchrone,
name='rsu-api-saga-retour-asynchrone'),
- url(r'^saga/retour-synchrone/$', api_views.saga_retour_synchrone,
+ re_path(r'^saga/retour-synchrone/$', api_views.saga_retour_synchrone,
name='rsu-api-saga-retour-synchrone'),
- url(r'^saga/tiers/(?P\w+)/(?P[-\w]+)/$', api_views.saga_tiers,
+ re_path(r'^saga/tiers/(?P\w+)/(?P[-\w]+)/$', api_views.saga_tiers,
name='rsu-api-saga-tiers'),
- url(r'^saga/(?P[-\w]+)/factures/$', api_views.saga_factures,
+ re_path(r'^saga/(?P[-\w]+)/factures/$', api_views.saga_factures,
name='rsu-api-saga-factures'),
- url(r'^saga/(?P[-\w]+)/transaction/$', api_views.saga_transaction,
+ re_path(r'^saga/(?P[-\w]+)/transaction/$', api_views.saga_transaction,
name='rsu-api-saga-transaction'),
- url(r'^qf/lire-quotients-valides/$', api_views.qf_lire_quotiens_valides,
+ re_path(r'^qf/lire-quotients-valides/$', api_views.qf_lire_quotiens_valides,
name='rsu-api-qf-lire-quotients-valides'),
- url(r'^qf/simuler/$', api_views.qf_simuler,
+ re_path(r'^qf/simuler/$', api_views.qf_simuler,
name='rsu-api-qf-simuler'),
- url(r'^qf/(?P[-\w]+)/$', api_views.qf_calculer,
+ re_path(r'^qf/(?P[-\w]+)/$', api_views.qf_calculer,
name='rsu-api-qf-calculer'),
- url(r'^qf/(?P[-\w]+)/editer-carte/(?P\w+)/$', api_views.qf_editer_carte,
+ re_path(r'^qf/(?P[-\w]+)/editer-carte/(?P\w+)/$', api_views.qf_editer_carte,
name='rsu-api-qf-editer-carte'),
- url(r'^doublons/$', api_views.doublons,
+ re_path(r'^doublons/$', api_views.doublons,
name='rsu-api-doublons'),
- url(r'^doublons/(?P[0-9 ]+)/$', api_views.doublon,
+ re_path(r'^doublons/(?P[0-9 ]+)/$', api_views.doublon,
name='rsu-api-doublon'),
- url(r'^doublons/(?P[0-9 ]+)/false-positive/$', api_views.false_positive,
+ re_path(r'^doublons/(?P[0-9 ]+)/false-positive/$', api_views.false_positive,
name='rsu-api-doublon-false-positive'),
- url(r'^doublons/(?P[0-9 ]+)/dedup/$', api_views.dedup,
+ re_path(r'^doublons/(?P[0-9 ]+)/dedup/$', api_views.dedup,
name='rsu-api-doublon-dedup'),
]