Django2 urls

Ernestophone/urls.py

@@ -1,36 +1,33 @@
-from django.conf.urls import include, url
 from django.contrib import admin
 from django.contrib.auth import views as auth_views
 from django.conf.urls.static import static
 from django.conf import settings
+from django.urls import include, path
 
 from gestion import views as gestion_views
 
+
 urlpatterns = [
-    url(r'^$', gestion_views.home, name='home'),
-    url(r'^login/?$', gestion_views.login, name='login'),
-    url(r'^logout/?$', auth_views.logout, {'next_page': '/'}, name='logout'),
-    url(r'^registration/?$', gestion_views.inscription_membre,
-        name='registration'),
-    url(r'^change/?', gestion_views.change_membre, name='change_membre'),
-    url(r'^password/?', gestion_views.change_password, name='change_password'),
-    url(r'^user/password/reset/$', auth_views.password_reset,
-        {'post_reset_redirect': '/user/password/reset/done/'},
-        name="password_reset"),
-    url(r'^user/password/reset/done/$',
-        auth_views.password_reset_done),
-    url(r'^user/password/reset/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$',
-        auth_views.password_reset_confirm,
-        {'post_reset_redirect': '/user/password/done/'},
-        name="password_reset_confirm"),
-    url(r'^user/password/done/$',
-        auth_views.password_reset_complete),
-    url(r'^admin/', include(admin.site.urls)),
-    url(r'^partitions/', include('partitions.urls')),
-    url(r'^pads/', include('pads.urls')),
-    url(r'^calendar/', include('calendrier.urls')),
-    url(r'^propositions/', include('propositions.urls')),
-    url(r'^divers/', gestion_views.divers),
+    path("", gestion_views.home, name="home"),
+    path("login", gestion_views.login, name="login"),
+    path("logout", auth_views.logout, {"next_page": "/"}, name="logout"),
+    path("registration", gestion_views.inscription_membre, name="registration"),
+    path("change", gestion_views.change_membre, name="change_membre"),
+    path("password", gestion_views.change_password, name="change_password"),
+    path("user/password/reset", auth_views.password_reset,
+         {"post_reset_redirect": "/user/password/reset/done/"},
+         name="password_reset"),
+    path("user/password/reset/done", auth_views.password_reset_done),
+    path("user/password/reset/<uidb64>/<token>/", auth_views.password_reset_confirm,
+         {'post_reset_redirect': '/user/password/done/'},
+         name="password_reset_confirm"),
+    path("user/password/done", auth_views.password_reset_complete),
+    path("admin/", admin.site.urls),
+    path("partitions/", include('partitions.urls')),
+    path("pads/", include('pads.urls')),
+    path("calendar/", include('calendrier.urls')),
+    path("propositions/", include('propositions.urls')),
+    path("divers/", gestion_views.divers),
 ]
 
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

calendrier/urls.py

@@ -1,20 +1,20 @@
-from django.conf.urls import url
+from django.urls import path
 
-from calendrier import views
-from calendrier.views import EventUpdate, EventDelete
+from . import views
+from .views import EventUpdate, EventDelete
 
+
+app_name = "calendrier"
 urlpatterns = [
-    url(r'^new$', views.create_event, name='calendrier-create_event'),
-    url(r'^$', views.home),
-    url(r'^edition/(?P<pk>\d+)$', EventUpdate.as_view()),
-    url(r'^supprimer/(?P<pk>\d+)$', EventDelete.as_view()),
-    url(r'^resend/(?P<id>\d+)$', views.resend, name='calendrier-resend'),
-    url(r'^changename/?$', views.changename, name='change-doodle-name'),
-    url(r'(?P<id>\d+)/reponse/?', views.reponse, name='calendrier-reponse'),
-    url(r'(?P<codeus>\w{6})/(?P<codeev>\w{6})/(?P<coderep>\w+)/?',
-        views.reponse_event,
-        name='calendrier.reponse_event'),
-    url(r'(?P<pYear>\d+)/(?P<pMonth>\d+)/(?P<id>\d+)/?', views.view_event),
-    url(r'(?P<pYear>\d+)/(?P<pMonth>\d+)/?$', views.calendar),
-    url(r'(?P<id>\d+)/?', views.view_eventbis, name='view-event'),
+    path("", views.home),
+    path("new", views.create_event, name="create_event"),
+    path("edition/<int:pk>", EventUpdate.as_view()),
+    path("supprimer/<int:pk>", EventDelete.as_view()),
+    path("resend/<int:id>", views.resend, name="resend"),
+    path("changename", views.changename, name="change-doodle-name"),
+    path("<int:id>/reponse", views.reponse, name="reponse"),
+    path("rep/<slug:codeus>/<slug:codeev>/<slug:coderep>", views.reponse_event, name="reponse_event"),
+    path("<int:pYear>/<int:pMonth>/<int:id>", views.view_event),
+    path("<int:pYear>/<int:pMonth>", views.calendar),
+    path("<int:id>", views.view_eventbis, name="view-event"),
 ]

calendrier/views.py

@@ -4,7 +4,7 @@ from django.shortcuts import render, redirect, get_object_or_404
 from django.contrib.sites.shortcuts import get_current_site
 from django.utils.safestring import mark_safe
 from django.views.generic import UpdateView, DeleteView
-from django.core.urlresolvers import reverse, reverse_lazy
+from django.urls import reverse, reverse_lazy
 from django.contrib.auth.decorators import login_required
 from django.utils.decorators import method_decorator
 from django.core.mail import send_mail

pads/urls.py

@@ -1,12 +1,13 @@
-from django.conf.urls import url
+from django.urls import path
 
 from pads import views
 from pads.views import PadUpdate, PadDelete
 
 
+app_name = "pads"
 urlpatterns = [
-    url(r'^$', views.liste_pads, name='pads-liste'),
-    url(r'^ajouter$', views.add_pad, name='pads-add'),
-    url(r'^edition/(?P<pk>\d+)$', PadUpdate.as_view()),
-    url(r'^supprimer/(?P<pk>\d+)$', PadDelete.as_view()),
+    path("", views.liste_pads, name="list"),
+    path("ajouter", views.add_pad, name="add"),
+    path("edition/<int:pk>", PadUpdate.as_view()),
+    path("supprimer/<int:pk>", PadDelete.as_view()),
 ]

pads/views.py

@@ -1,6 +1,6 @@
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import render
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.views.generic import UpdateView, DeleteView
 from django.utils.decorators import method_decorator
 from datetime import date

partitions/urls.py

@@ -1,24 +1,17 @@
-from django.conf.urls import url
+from django.urls import path
 
-from partitions import views
+from . import views
 
+app_name = "partitions"
 urlpatterns = [
-    url(r'^$', views.liste, name='partitions-liste'),
-    url(r'^(?P<nom>[^/]+)/(?P<auteur>[^/]+)/?$', views.listepart,
-        name='partitions-listepart'),
-    url(r'^(?P<nom>[^/]+)/(?P<auteur>[^/]+)/upload/?$', views.upload,
-        name='partitions-upload'),
-    url(r'^(?P<nom>[^/]+)/(?P<auteur>[^/]+)/delete/?$', views.delete_morc,
-        name='partitions-delete_morc'),
-    url(r'^(?P<nom>[^/]+)/(?P<auteur>[^/]+)/conf/?$', views.conf_delete_morc,
-        name='partitions-conf_delete_morc'),
-    url(r'^(?P<nom>[^/]+)/(?P<auteur>[^/]+)/see/(?P<partition_id>\d+)/?$',
-        views.see, name='partitions-see'),
-    url(r'^(?P<nom>[^/]+)/(?P<auteur>[^/]+)/(?P<partition_id>\d+)/$',
-        views.download, name='partitions-download'),
-    url(r'^(?P<nom>[^/]+)/(?P<auteur>[^/]+)/(?P<id>[^/]+)/delete/?$',
-        views.delete, name='partitions-delete'),
-    url(r'^(?P<nom>[^/]+)/(?P<auteur>[^/]+)/(?P<id>[^/]+)/conf/?$',
-        views.conf_delete, name='partitions-conf_delete'),
-    url(r'^new/?$', views.ajouter_morceau, name='partitions-ajouter_morceau'),
+    path("", views.liste, name="liste"),
+    path("<str:nom>/<str:auteur>", views.listepart, name="listepart"),
+    path("<str:nom>/<str:auteur>/upload", views.upload, name="upload"),
+    path("<str:nom>/<str:auteur>/delete", views.delete_morc, name="delete_morc"),
+    path("<str:nom>/<str:auteur>/conf", views.conf_delete_morc, name="conf_delete_morc"),
+    path("<str:nom>/<str:auteur>/see/<int:partition_id>", views.see, name="see"),
+    path("<str:nom>/<str:auteur>/<int:partition_id>", views.download, name="download"),
+    path("<str:nom>/<str:auteur>/<int:id>/delete", views.delete, name="delete"),
+    path("<str:nom>/<str:auteur>/<int:id>/conf", views.conf_delete, name="conf_delete"),
+    path("new", views.ajouter_morceau, name="ajouter_morceau'"),
 ]

propositions/urls.py

@@ -1,13 +1,13 @@
-from django.conf.urls import url
+from django.urls import path
 
 from propositions.views import PropDelete
 from propositions import views
 
+app_name = "propositions"
 urlpatterns = [
-    url(r'^$', views.liste, name='propositions-liste'),
-    url(r'^new/?$', views.create_prop, name='propositions-create'),
-    url(r'^(?P<id>\d+)/oui/?$', views.repoui, name='propositions-oui'),
-    url(r'^(?P<id>\d+)/non/?$', views.repnon, name='propositions-non'),
-    url(r'^(?P<pk>\d+)/supprimer/?$', PropDelete.as_view(),
-        name='propositions-delete'),
+    path("", views.liste, name="liste"),
+    path("new", views.create_prop, name="create"),
+    path("<int:id>/oui", views.repoui, name="oui"),
+    path("<int:id>/non", views.repnon, name="non"),
+    path("<int:pk>/supprimer", PropDelete.as_view(), name="delete"),
 ]

propositions/views.py

@@ -1,5 +1,5 @@
 from django.shortcuts import render, redirect, get_object_or_404
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.contrib.auth.decorators import login_required
 from django.views.generic import DeleteView
 from django.utils.decorators import method_decorator