Update to work with newer django and python3

[sommitrealweird.git] / sommitrealweird / urls.py

diff --git a/sommitrealweird/urls.py b/sommitrealweird/urls.py
index 6e7cf994fb33567c2b83f830bfa3cc17e9b6e0c4..1b9f9d1fcda1b001648675302baae51921635dac 100644 (file)
--- a/sommitrealweird/urls.py
+++ b/sommitrealweird/urls.py
@@ -1,12 +1,12 @@
-from django.conf.urls import include, url
+from django.urls import include, re_path
 from django.conf.urls.static import static
-import bpcms.views
+import sommitrealweird.bpcms.views
 import django.views.static
-from settings import MEDIA_ROOT, MEDIA_URL, STATIC_ROOT, STATIC_URL
-from blog.feeds import LatestBlogEntries, LatestBlogEntriesRss
+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,
@@ -23,15 +23,15 @@ urlpatterns = [
     # (r'^sommitrealweird/', include('sommitrealweird.foo.urls')),
 
     # Uncomment this for admin:
-    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'^static/(?P<path>.*)$', django.views.static.serve, {'document_root': STATIC_ROOT, 'show_indexes': True}),
-    url(r'^admin/', admin.site.urls),
-    url(r'^blog/', include('blog.urls')),
-    url(r'^photo/', include('photo.urls')),
+    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')),
-    url(r'^css-doc/(?P<slug>.*)$', bpcms.views.css_view),
-    url(r'^feeds/rss/blog/', LatestBlogEntriesRss()),
-    url(r'^feeds/blog/', LatestBlogEntries()),
-    url(r'^', include('bpcms.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'))
 ]