From ee7a49fa7094160f27993adb25fb2d98db518cb9 Mon Sep 17 00:00:00 2001 From: Adam Feldman Date: Sun, 25 Sep 2016 18:22:30 -0500 Subject: [PATCH] Fix for patterns() being deprecated and now removed in Django 1.10 --- pinax/wiki/urls.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pinax/wiki/urls.py b/pinax/wiki/urls.py index efebab4..224ef3f 100644 --- a/pinax/wiki/urls.py +++ b/pinax/wiki/urls.py @@ -1,20 +1,18 @@ import os -from django.conf.urls import patterns, url +from django.conf.urls import url from .conf import settings from .views import index, page, edit, file_download, file_upload -urlpatterns = patterns( - "", +urlpatterns = [ url(r"^file-download/(\d+)/([^/]+)$", file_download, name="pinax_wiki_file_download"), url(r"^file-upload/$", file_upload, name="pinax_wiki_file_upload") -) +] for binder in settings.PINAX_WIKI_BINDERS: - urlpatterns += patterns( - "", + urlpatterns += [ url(os.path.join(binder.root, r"$"), index, {"binder": binder}, name=binder.index_url_name), url(os.path.join(binder.root, r"(?P[^/]+)/$"), page, {"binder": binder}, name=binder.page_url_name), url(os.path.join(binder.root, r"(?P[^/]+)/edit/$"), edit, {"binder": binder}, name=binder.edit_url_name), - ) + ]