Stop using an array as a cache key

[sommitrealweird.git] / sommitrealweird / urls.py

diff --git a/sommitrealweird/urls.py b/sommitrealweird/urls.py
index 8415b54f82cb15f224421e187a4d37e13e62a32e..2aaf73df89820e2b37a9a5ed59d1586c7dde3961 100644 (file)
--- a/sommitrealweird/urls.py
+++ b/sommitrealweird/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls.defaults import *
 from settings import MEDIA_ROOT, MEDIA_URL
 from django.conf.urls.defaults import *
 from settings import MEDIA_ROOT, MEDIA_URL

-from blog.feeds import LatestBlogEntries
+from blog.feeds import LatestBlogEntries, LatestBlogEntriesRss

 from django.contrib import admin
 
 handler404 = 'generic.views.render_404'
 from django.contrib import admin
 
 handler404 = 'generic.views.render_404'


@@ -9,7 +9,11 @@ feeds_dict = {
     'blog': LatestBlogEntries,
     }
 
     'blog': LatestBlogEntries,
     }
 

-#admin.autodiscover()
+rssfeeds_dict = {
+    'blog': LatestBlogEntriesRss,
+    }
+
+admin.autodiscover()

 
 urlpatterns = patterns('',
     # Example:
 
 urlpatterns = patterns('',
     # Example:


@@ -18,8 +22,13 @@ urlpatterns = patterns('',
     # 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}),
     # 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'^admin/', include(admin.site.urls)),

     (r'^blog/', include('blog.urls')),
     (r'^blog/', include('blog.urls')),

-    (r'^feeds/(?P<url>.*)/', 'django.contrib.syndication.views.feed', {'feed_dict': feeds_dict}),
+    (r'^photo/', include('photo.urls')),
+    (r'^photos/', include('photo.urls')),
+    (r'^css-doc/(?P<slug>.*)$', 'bpcms.views.css_view'),
+    (r'^feeds/rss/blog/', LatestBlogEntriesRss()),
+    (r'^feeds/blog/', LatestBlogEntries()),
+    (r'^comments/', include('django.contrib.comments.urls')),

     (r'^(?:content/|)', include('bpcms.urls'))
 )
     (r'^(?:content/|)', include('bpcms.urls'))
 )