From 0a5a3efac5613e209573ca9cc0ea74bb8f0e0a90 Mon Sep 17 00:00:00 2001 From: Brent O'Connor Date: Mon, 15 Feb 2016 11:54:25 -0600 Subject: [PATCH] Updated urls to work without patterns since patterns is being deprecated --- categories/urls.py | 9 +++++---- example/urls.py | 14 ++++++++------ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/categories/urls.py b/categories/urls.py index 333c6b7..c666c62 100644 --- a/categories/urls.py +++ b/categories/urls.py @@ -1,5 +1,6 @@ -from django.conf.urls import patterns, url +from django.conf.urls import url from .models import Category +from . import views try: from django.views.generic import DetailView, ListView @@ -15,12 +16,12 @@ categorytree_dict = { 'queryset': Category.objects.filter(level=0) } -urlpatterns = patterns('', +urlpatterns = ( url( r'^$', ListView.as_view(**categorytree_dict), name='categories_tree_list' ), ) -urlpatterns += patterns('categories.views', - url(r'^(?P.+)/$', 'category_detail', name='categories_category'), +urlpatterns += ( + url(r'^(?P.+)/$', views.category_detail, name='categories_category'), ) diff --git a/example/urls.py b/example/urls.py index a15924d..d19d430 100644 --- a/example/urls.py +++ b/example/urls.py @@ -1,7 +1,9 @@ -from django.conf.urls import patterns, include +from django.conf.urls import include, url # Uncomment the next two lines to enable the admin: from django.contrib import admin +from django.views.static import serve + admin.autodiscover() @@ -9,7 +11,7 @@ import os ROOT_PATH = os.path.dirname(os.path.dirname(__file__)) -urlpatterns = patterns('', +urlpatterns = ( # Example: # (r'^sample/', include('sample.foo.urls')), @@ -18,18 +20,18 @@ urlpatterns = patterns('', # (r'^admin/doc/', include('django.contrib.admindocs.urls')), # Uncomment the next line to enable the admin: - (r'^admin/', include(admin.site.urls)), - (r'^categories/', include('categories.urls')), + url(r'^admin/', include(admin.site.urls)), + url(r'^categories/', include('categories.urls')), #(r'^cats/', include('categories.urls')), - (r'^static/categories/(?P.*)$', 'django.views.static.serve', + url(r'^static/categories/(?P.*)$', serve, {'document_root': ROOT_PATH + '/categories/media/categories/'}), # (r'^static/editor/(?P.*)$', 'django.views.static.serve', # {'document_root': ROOT_PATH + '/editor/media/editor/', # 'show_indexes':True}), - (r'^static/(?P.*)$', 'django.views.static.serve', + url(r'^static/(?P.*)$', serve, {'document_root': os.path.join(ROOT_PATH, 'example', 'static')}), )