X-Git-Url: https://git.sommitrealweird.co.uk/sommitrealweird.git/blobdiff_plain/21c466b2004e4c80e88de3e53b41c8e03f7f3d79..e1b491186d911fcdc98b18b4c0031ed65d43fdae:/sommitrealweird/blog/urls.py?ds=sidebyside diff --git a/sommitrealweird/blog/urls.py b/sommitrealweird/blog/urls.py index 2ec24bd..7ce99ef 100644 --- a/sommitrealweird/blog/urls.py +++ b/sommitrealweird/blog/urls.py @@ -1,13 +1,14 @@ -from django.conf.urls.defaults import * +from django.urls import re_path +import blog.views from settings import MEDIA_ROOT, MEDIA_URL -urlpatterns = patterns('', - (r'^(?P[0-9]{4})/(?P[0-9]{2})/(?P[0-9]{2})/(?P[^/]+)(/|)$', 'blog.views.blog_view'), - (r'^(?P[0-9]{4})(?P[0-9]{2})(?P[0-9]{2})-(?P[^/]+)\.html$', 'blog.views.blog_view'), - (r'^(?P[0-9]{4})(?P[0-9]{2})(?P[0-9]{2})(?P[0-9]{2})(?P[0-9]{2})-(?P[^/]+)\.html$', 'blog.views.blog_view'), - (r'^(?P[0-9]{4})/(?P[0-9]{2})/(?P[0-9]{2})/$', 'blog.views.blog_view'), - (r'^(?P[0-9]{4})/(?P[0-9]{2})/$', 'blog.views.blog_view'), - (r'^(?P[0-9]{4})/$', 'blog.views.blog_view'), - (r'^section/(?P
[^/]*)/$', 'blog.views.blog_index'), - (r'^$', 'blog.views.blog_index'), -) +urlpatterns = [ + re_path(r'^(?P[0-9]{4})/(?P[0-9]{2})/(?P[0-9]{2})/(?P[^/]+)(/|)$', blog.views.blog_view), + re_path(r'^(?P[0-9]{4})(?P[0-9]{2})(?P[0-9]{2})-(?P[^/]+)\.html$', blog.views.blog_view), + re_path(r'^(?P[0-9]{4})(?P[0-9]{2})(?P[0-9]{2})(?P[0-9]{2})(?P[0-9]{2})-(?P[^/]+)\.html$', blog.views.blog_view), + re_path(r'^(?P[0-9]{4})/(?P[0-9]{2})/(?P[0-9]{2})/$', blog.views.blog_view), + re_path(r'^(?P[0-9]{4})/(?P[0-9]{2})/$', blog.views.blog_view), + re_path(r'^(?P[0-9]{4})/$', blog.views.blog_view), + re_path(r'^section/(?P
[^/]*)/$', blog.views.blog_index), + re_path(r'^$', blog.views.blog_index), +]