Initial port to django-1.7

[sommitrealweird.git] / sommitrealweird / blog / urls.py

diff --git a/sommitrealweird/blog/urls.py b/sommitrealweird/blog/urls.py
index f41ed25632470d3624692dbce6c7e8c645ce8265..19678eb6d1c31bc23f62ecfb67c86c4229e2e8f8 100644 (file)
--- a/sommitrealweird/blog/urls.py
+++ b/sommitrealweird/blog/urls.py
@@ -1,10 +1,13 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns
 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'),
 )