Skip to content

Commit d078f06

Browse files
authored
Replace deprecated urls with path (#28)
1 parent 9a090bf commit d078f06

File tree

1 file changed

+17
-29
lines changed

1 file changed

+17
-29
lines changed

mail_panel/urls.py

Lines changed: 17 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,23 @@
1-
from django.conf.urls import url
2-
from .views import (
3-
load_message, display_multipart, download_attachment, clear_message, clear_all_messages
4-
)
1+
from django.urls import include, path, re_path
52

6-
_PREFIX = 'mail_toolbar'
3+
from . import views
74

8-
urlpatterns = [
9-
url(
10-
r'^{0}/load_message/(?P<message_id>[\w]+)/$'.format(_PREFIX),
11-
load_message,
12-
name="load_message"
13-
),
14-
url(
15-
r'^{0}/download_attachment/(?P<message_id>[\w]+)/(?P<attachment_id>[\d]+)/$'.format(_PREFIX),
16-
download_attachment,
17-
name="download_attachment"
5+
mail_toolbar_patterns = [
6+
path("load_message/<slug:message_id>/", views.load_message, name="load_message"),
7+
path(
8+
"download_attachment/<slug:message_id>/<int:attachment_id>/",
9+
views.download_attachment,
10+
name="download_attachment",
1811
),
19-
url(
20-
r'^{0}/display_multipart/(?P<message_id>[\w]+)/(?P<multipart>[\w/]+)$'.format(_PREFIX),
21-
display_multipart,
22-
name="display_multipart"
12+
re_path(
13+
r"^display_multipart/(?P<message_id>[\w]+)/(?P<multipart>[\w/]+)$",
14+
views.display_multipart,
15+
name="display_multipart",
2316
),
17+
path("clear_message/<slug:message_id>/", views.clear_message, name="clear_message"),
18+
path("clear_all_messages/", views.clear_all_messages, name="clear_all_messages"),
19+
]
2420

25-
url(
26-
r'^{0}/clear_message/(?P<message_id>[\w]+)/$'.format(_PREFIX),
27-
clear_message,
28-
name="clear_message"
29-
),
30-
url(
31-
r'^{0}/clear_all_messages/$'.format(_PREFIX),
32-
clear_all_messages,
33-
name="clear_all_messages"
34-
),
21+
urlpatterns = [
22+
path("mail_toolbar/", include(mail_toolbar_patterns)),
3523
]

0 commit comments

Comments
 (0)