Skip to content

Commit 6cef277

Browse files
replace url() by path/re_path() in demo app (#313)
Co-authored-by: GFJ138 <sebastien.dementen@engie.com>
1 parent bd90a95 commit 6cef277

File tree

2 files changed

+20
-19
lines changed

2 files changed

+20
-19
lines changed

demo/demo/urls.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# pylint: disable=wrong-import-position,wrong-import-order
1818

1919
from django.contrib import admin
20-
from django.urls import include
20+
from django.urls import include, path
2121
from django.conf.urls import url
2222

2323
from django.views.generic import TemplateView
@@ -35,21 +35,21 @@
3535
from .views import dash_example_1_view, session_state_view
3636

3737
urlpatterns = [
38-
url('^$', TemplateView.as_view(template_name='index.html'), name="home"),
39-
url('^demo-one$', TemplateView.as_view(template_name='demo_one.html'), name="demo-one"),
40-
url('^demo-two$', TemplateView.as_view(template_name='demo_two.html'), name="demo-two"),
41-
url('^demo-three$', TemplateView.as_view(template_name='demo_three.html'), name="demo-three"),
42-
url('^demo-four$', TemplateView.as_view(template_name='demo_four.html'), name="demo-four"),
43-
url('^demo-five$', TemplateView.as_view(template_name='demo_five.html'), name="demo-five"),
44-
url('^demo-six', dash_example_1_view, name="demo-six"),
45-
url('^demo-seven', TemplateView.as_view(template_name='demo_seven.html'), name="demo-seven"),
46-
url('^demo-eight', session_state_view, {'template_name':'demo_eight.html'}, name="demo-eight"),
47-
url('^demo-nine', TemplateView.as_view(template_name='demo_nine.html'), name="demo-nine"),
48-
url('^demo-ten', TemplateView.as_view(template_name='demo_ten.html'), name="demo-ten"),
49-
url('^admin/', admin.site.urls),
50-
url('^django_plotly_dash/', include('django_plotly_dash.urls')),
51-
52-
url('^demo-session-var$', add_to_session, name="session-variable-example"),
38+
path('', TemplateView.as_view(template_name='index.html'), name="home"),
39+
path('demo-one', TemplateView.as_view(template_name='demo_one.html'), name="demo-one"),
40+
path('demo-two', TemplateView.as_view(template_name='demo_two.html'), name="demo-two"),
41+
path('demo-three', TemplateView.as_view(template_name='demo_three.html'), name="demo-three"),
42+
path('demo-four', TemplateView.as_view(template_name='demo_four.html'), name="demo-four"),
43+
path('demo-five', TemplateView.as_view(template_name='demo_five.html'), name="demo-five"),
44+
path('demo-six', dash_example_1_view, name="demo-six"),
45+
path('demo-seven', TemplateView.as_view(template_name='demo_seven.html'), name="demo-seven"),
46+
path('demo-eight', session_state_view, {'template_name':'demo_eight.html'}, name="demo-eight"),
47+
path('demo-nine', TemplateView.as_view(template_name='demo_nine.html'), name="demo-nine"),
48+
path('demo-ten', TemplateView.as_view(template_name='demo_ten.html'), name="demo-ten"),
49+
path('admin/', admin.site.urls),
50+
path('django_plotly_dash/', include('django_plotly_dash.urls')),
51+
52+
path('demo-session-var', add_to_session, name="session-variable-example"),
5353
]
5454

5555
# Add in static routes so daphne can serve files; these should

django_plotly_dash/routing.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
from channels.http import AsgiHandler
2828

2929
from django.conf.urls import url
30+
from django.urls import re_path
3031

3132
from .consumers import MessageConsumer, PokePipeConsumer
3233
from .util import pipe_ws_endpoint_name, http_endpoint, http_poke_endpoint_enabled
@@ -37,11 +38,11 @@
3738
]
3839

3940
if http_poke_endpoint_enabled():
40-
http_routes.append(url(http_endpoint("poke"), PokePipeConsumer))
41+
http_routes.append(re_path(http_endpoint("poke"), PokePipeConsumer))
4142

42-
http_routes.append(url("^", AsgiHandler)) # AsgiHandler is 'the normal Django view handlers'
43+
http_routes.append(re_path("^", AsgiHandler)) # AsgiHandler is 'the normal Django view handlers'
4344

4445
application = ProtocolTypeRouter({
45-
'websocket': AuthMiddlewareStack(URLRouter([url(pipe_ws_endpoint_name(), MessageConsumer),])),
46+
'websocket': AuthMiddlewareStack(URLRouter([re_path(pipe_ws_endpoint_name(), MessageConsumer),])),
4647
'http': AuthMiddlewareStack(URLRouter(http_routes)),
4748
})

0 commit comments

Comments
 (0)