-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix for patterns() being deprecated and now removed in Django 1.10
- Loading branch information
1 parent
06c65bf
commit ee7a49f
Showing
1 changed file
with
5 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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<slug>[^/]+)/$"), page, {"binder": binder}, name=binder.page_url_name), | ||
url(os.path.join(binder.root, r"(?P<slug>[^/]+)/edit/$"), edit, {"binder": binder}, name=binder.edit_url_name), | ||
) | ||
] |