X-Git-Url: https://git.sommitrealweird.co.uk/sommitrealweird.git/blobdiff_plain/21c466b2004e4c80e88de3e53b41c8e03f7f3d79..0da449be342d2024f3c87a065ed30da80c96bfa5:/sommitrealweird/blog/urls.py

diff --git a/sommitrealweird/blog/urls.py b/sommitrealweird/blog/urls.py
index 2ec24bd..eeeb25b 100644
--- a/sommitrealweird/blog/urls.py
+++ b/sommitrealweird/blog/urls.py
@@ -1,13 +1,14 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import url
+import blog.views
 from settings import MEDIA_ROOT, MEDIA_URL
 
-urlpatterns = patterns('',
-    (r'^(?P<year>[0-9]{4})/(?P<month>[0-9]{2})/(?P<day>[0-9]{2})/(?P<slug>[^/]+)(/|)$', 'blog.views.blog_view'),
-    (r'^(?P<year>[0-9]{4})(?P<month>[0-9]{2})(?P<day>[0-9]{2})-(?P<slug>[^/]+)\.html$', 'blog.views.blog_view'),
-    (r'^(?P<year>[0-9]{4})(?P<month>[0-9]{2})(?P<day>[0-9]{2})(?P<hour>[0-9]{2})(?P<minutes>[0-9]{2})-(?P<slug>[^/]+)\.html$', 'blog.views.blog_view'),
-    (r'^(?P<year>[0-9]{4})/(?P<month>[0-9]{2})/(?P<day>[0-9]{2})/$', 'blog.views.blog_view'),
-    (r'^(?P<year>[0-9]{4})/(?P<month>[0-9]{2})/$', 'blog.views.blog_view'),
-    (r'^(?P<year>[0-9]{4})/$', 'blog.views.blog_view'),
-    (r'^section/(?P<section>[^/]*)/$', 'blog.views.blog_index'),
-    (r'^$', 'blog.views.blog_index'),
-)
+urlpatterns = [
+    url(r'^(?P<year>[0-9]{4})/(?P<month>[0-9]{2})/(?P<day>[0-9]{2})/(?P<slug>[^/]+)(/|)$', blog.views.blog_view),
+    url(r'^(?P<year>[0-9]{4})(?P<month>[0-9]{2})(?P<day>[0-9]{2})-(?P<slug>[^/]+)\.html$', blog.views.blog_view),
+    url(r'^(?P<year>[0-9]{4})(?P<month>[0-9]{2})(?P<day>[0-9]{2})(?P<hour>[0-9]{2})(?P<minutes>[0-9]{2})-(?P<slug>[^/]+)\.html$', blog.views.blog_view),
+    url(r'^(?P<year>[0-9]{4})/(?P<month>[0-9]{2})/(?P<day>[0-9]{2})/$', blog.views.blog_view),
+    url(r'^(?P<year>[0-9]{4})/(?P<month>[0-9]{2})/$', blog.views.blog_view),
+    url(r'^(?P<year>[0-9]{4})/$', blog.views.blog_view),
+    url(r'^section/(?P<section>[^/]*)/$', blog.views.blog_index),
+    url(r'^$', blog.views.blog_index),
+]