Fixes #4076: Recommendations from collections.

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

diff --git a/src/opds/urls.py b/src/opds/urls.py
index 00831f0..1d68199 100644 (file)
--- a/src/opds/urls.py
+++ b/src/opds/urls.py
@@ -1,16 +1,15 @@
-# -*- coding: utf-8 -*-

 # 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.urls import path

 from opds.views import RootFeed, ByCategoryFeed, ByTagFeed, UserFeed, UserSetFeed, SearchFeed
 
 
 from opds.views import RootFeed, ByCategoryFeed, ByTagFeed, UserFeed, UserSetFeed, SearchFeed
 
 

-urlpatterns = patterns('opds.views',
-    url(r'^$', RootFeed(), name="opds_authors"),
-    url(r'^search/$', SearchFeed(), name="opds_search"),
-    url(r'^user/$', UserFeed(), name="opds_user"),
-    url(r'^set/(?P<slug>[a-zA-Z0-9-]+)/$', UserSetFeed(), name="opds_user_set"),
-    url(r'^(?P<category>[a-zA-Z0-9-]+)/$', ByCategoryFeed(), name="opds_by_category"),
-    url(r'^(?P<category>[a-zA-Z0-9-]+)/(?P<slug>[a-zA-Z0-9-]+)/$', ByTagFeed(), name="opds_by_tag"),
-)
+urlpatterns = [
+    path('', RootFeed(), name="opds_authors"),
+    path('search/', SearchFeed(), name="opds_search"),
+    path('user/', UserFeed(), name="opds_user"),
+    path('set/<slug>/', UserSetFeed(), name="opds_user_set"),
+    path('<category>/', ByCategoryFeed(), name="opds_by_category"),
+    path('<category>/<slug>/', ByTagFeed(), name="opds_by_tag"),
+]