Update to work with newer django and python3

[sommitrealweird.git] / sommitrealweird / urls.py

diff --git a/sommitrealweird/urls.py b/sommitrealweird/urls.py
index b709acced792c93e27330fea820be3f1576d06d8..1b9f9d1fcda1b001648675302baae51921635dac 100644 (file)
--- a/sommitrealweird/urls.py
+++ b/sommitrealweird/urls.py
@@ -1,23 +1,37 @@
-from django.conf.urls.defaults import *
-from settings import MEDIA_ROOT, MEDIA_URL
-from blog.feeds import LatestBlogEntries
+from django.urls import include, re_path
+from django.conf.urls.static import static
+import sommitrealweird.bpcms.views
+import django.views.static
+from sommitrealweird.settings import MEDIA_ROOT, MEDIA_URL, STATIC_ROOT, STATIC_URL
+from sommitrealweird.blog.feeds import LatestBlogEntries, LatestBlogEntriesRss
+from django.contrib import admin
 
-handler404 = 'generic.views.render_404'
+handler404 = 'sommitrealweird.generic.views.render_404'
 
 feeds_dict = {
     'blog': LatestBlogEntries,
     }
 
-urlpatterns = patterns('',
+rssfeeds_dict = {
+    'blog': LatestBlogEntriesRss,
+    }
+
+admin.autodiscover()
+
+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/', include('django.contrib.admin.urls')),
-    (r'^blog/', include('blog.urls')),
-    (r'^feeds/(?P<url>.*)/', 'django.contrib.syndication.views.feed', {'feed_dict': feeds_dict}),
-    (r'^(?:content/|)(?P<slug>[^/]+)/$', 'bpcms.views.document_view'),
-    (r'^(?:content/|)(?P<folders>.*)/(?P<slug>[^/]+)/$', 'bpcms.views.document_view'),
-)
+    re_path(r'^$', sommitrealweird.bpcms.views.document_view, {'path': 'index'}),
+    re_path(r'^media/(?P<path>.*)$', django.views.static.serve, {'document_root': MEDIA_ROOT, 'show_indexes': True}),
+    re_path(r'^static/(?P<path>.*)$', django.views.static.serve, {'document_root': STATIC_ROOT, 'show_indexes': True}),
+    re_path(r'^admin/', admin.site.urls),
+    re_path(r'^blog/', include('sommitrealweird.blog.urls')),
+    re_path(r'^photo/', include('sommitrealweird.photo.urls')),
+    #url(r'^photos/', include('photo.urls')),
+    re_path(r'^css-doc/(?P<slug>.*)$', sommitrealweird.bpcms.views.css_view),
+    re_path(r'^feeds/rss/blog/', LatestBlogEntriesRss()),
+    re_path(r'^feeds/blog/', LatestBlogEntries()),
+    re_path(r'^', include('sommitrealweird.bpcms.urls'))
+]