Remaining Django 1.9 fixes.

[wolnelektury.git] / src / social / urls.py

diff --git a/src/social/urls.py b/src/social/urls.py
index f9222ce..395e54a 100755 (executable)
--- a/src/social/urls.py
+++ b/src/social/urls.py
@@ -2,26 +2,19 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from django.conf.urls import patterns, url
+from django.conf.urls import url

 from django.views.decorators.cache import never_cache
 from django.views.decorators.cache import never_cache

-from social.views import ObjectSetsFormView
+from . import views

 
 

-urlpatterns = patterns(
-    'social.views',
-    url(r'^lektura/(?P<slug>[a-z0-9-]+)/lubie/$', 'like_book', name='social_like_book'),
-    url(r'^lektura/(?P<slug>[a-z0-9-]+)/nie_lubie/$', 'unlike_book', name='social_unlike_book'),
-    url(r'^lektura/(?P<slug>[a-z0-9-]+)/polki/$', never_cache(ObjectSetsFormView()), name='social_book_sets'),
-    url(r'^polka/$', 'my_shelf', name='social_my_shelf'),

 
 

-    # Includes
-    url(r'^cite/(?P<pk>\d+)\.(?P<lang>.+)\.html$', 'cite', name='social_cite'),
-    url(r'^cite_main/(?P<pk>\d+)\.(?P<lang>.+)\.html$', 'cite', {'main': True}, name='social_cite_main'),
-    url(r'^cite_info/(?P<pk>\d+).html$', 'cite_info', name='social_cite_info'),
+urlpatterns = [
+    url(r'^lektura/(?P<slug>[a-z0-9-]+)/lubie/$', views.like_book, name='social_like_book'),
+    url(r'^lektura/(?P<slug>[a-z0-9-]+)/nie_lubie/$', views.unlike_book, name='social_unlike_book'),
+    url(r'^lektura/(?P<slug>[a-z0-9-]+)/polki/$', never_cache(views.ObjectSetsFormView()), name='social_book_sets'),
+    url(r'^polka/$', views.my_shelf, name='social_my_shelf'),

 
 

-    # url(r'^polki/(?P<shelf>[a-zA-Z0-9-]+)/formaty/$', 'shelf_book_formats', name='shelf_book_formats'),
-    # url(r'^polki/(?P<shelf>[a-zA-Z0-9-]+)/(?P<slug>%s)/usun$' % SLUG, 'remove_from_shelf', name='remove_from_shelf'),
-    # url(r'^polki/$', 'user_shelves', name='user_shelves'),
-    # url(r'^polki/(?P<slug>[a-zA-Z0-9-]+)/usun/$', 'delete_shelf', name='delete_shelf'),
-    # url(r'^polki/(?P<slug>[a-zA-Z0-9-]+)\.zip$', 'download_shelf', name='download_shelf'),
-    # url(r'^polki/nowa/$', 'new_set', name='new_set'),
-)
+    # Includes
+    url(r'^cite/(?P<pk>\d+)\.(?P<lang>.+)\.html$', views.cite, name='social_cite'),
+    url(r'^cite_main/(?P<pk>\d+)\.(?P<lang>.+)\.html$', views.cite, {'main': True}, name='social_cite_main'),
+    url(r'^cite_info/(?P<pk>\d+).html$', views.cite_info, name='social_cite_info'),
+]