Initial port to django-1.7

[sommitrealweird.git] / sommitrealweird / urls.py

diff --git a/sommitrealweird/urls.py b/sommitrealweird/urls.py
index dc24d72990bf072f98dc7d31eb03e68093c5b023..6c9c00621bbc13a04da8bc5581d79bb6c1e2b5ac 100644 (file)
--- a/sommitrealweird/urls.py
+++ b/sommitrealweird/urls.py
@@ -1,4 +1,5 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import include, url
+from django.conf.urls.static import static
 from settings import MEDIA_ROOT, MEDIA_URL
 from blog.feeds import LatestBlogEntries, LatestBlogEntriesRss
 from django.contrib import admin
@@ -15,18 +16,20 @@ rssfeeds_dict = {
 
 admin.autodiscover()
 
-urlpatterns = patterns('',
+urlpatterns = [
     # Example:
     # (r'^sommitrealweird/', include('sommitrealweird.foo.urls')),
 
     # Uncomment this for admin:
-    (r'^$', 'bpcms.views.document_view', {'slug': 'index'}),
-    (r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': MEDIA_ROOT, 'show_indexes': True}),
-    (r'^admin/(.*)$', admin.site.root),
-    (r'^blog/', include('blog.urls')),
-    (r'^photo/', include('photo.urls')),
-    (r'^photos/', include('photo.urls')),
-    (r'^feeds/rss/(?P<url>.*)/', 'django.contrib.syndication.views.feed', {'feed_dict': rssfeeds_dict}),
-    (r'^feeds/(?P<url>.*)/', 'django.contrib.syndication.views.feed', {'feed_dict': feeds_dict}),
-    (r'^(?:content/|)', include('bpcms.urls'))
-)
+    url(r'^$', 'bpcms.views.document_view', {'slug': 'index'}),
+    url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': MEDIA_ROOT, 'show_indexes': True}),
+    url(r'^admin/', include(admin.site.urls)),
+    url(r'^blog/', include('blog.urls')),
+    url(r'^photo/', include('photo.urls')),
+    #url(r'^photos/', include('photo.urls')),
+    url(r'^css-doc/(?P<slug>.*)$', 'bpcms.views.css_view'),
+    url(r'^feeds/rss/blog/', LatestBlogEntriesRss()),
+    url(r'^feeds/blog/', LatestBlogEntries()),
+    url(r'^comments/', include('django.contrib.comments.urls')),
+    url(r'^', include('bpcms.urls'))
+] + static(MEDIA_URL, MEDIA_ROOT)