# HG changeset patch # User neko259 # Date 2016-02-29 15:48:04 # Node ID c55955cedb351ed2c8c5f700113f206512ba3e8c # Parent 87524e39fe3807ad63f9fa69d3948c1a01ca4dca Updated urls list to be a plain list instead of 'patterns' method which is deprecated and will be removed in 1.10 diff --git a/boards/urls.py b/boards/urls.py --- a/boards/urls.py +++ b/boards/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import patterns, url +from django.conf.urls import url #from django.views.i18n import javascript_catalog import neboard @@ -19,7 +19,7 @@ js_info_dict = { 'packages': ('boards',), } -urlpatterns = patterns('', +urlpatterns = [ # /boards/ url(r'^$', all_threads.AllThreadsView.as_view(), name='index'), @@ -79,9 +79,8 @@ urlpatterns = patterns('', url(r'^notifications/$', NotificationView.as_view(), name='notifications'), # Post preview - url(r'^preview/$', PostPreviewView.as_view(), name='preview') - -) + url(r'^preview/$', PostPreviewView.as_view(), name='preview'), +] # Search if 'haystack' in neboard.settings.INSTALLED_APPS: diff --git a/neboard/urls.py b/neboard/urls.py --- a/neboard/urls.py +++ b/neboard/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import patterns, include, url +from django.conf.urls import include, url # Uncomment the next two lines to enable the admin: from django.conf.urls.static import static @@ -9,12 +9,12 @@ from boards.views.not_found import NotFo admin.autodiscover() -urlpatterns = patterns('', +urlpatterns = [ # Uncomment the admin/doc line below to enable admin documentation: # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), url(r'^admin/', include(admin.site.urls), name='admin'), url(r'^', include('boards.urls')), -) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) +] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) handler404 = NotFoundView.as_view()