Skip to content

Commit

Permalink
Be Django 1.10 compatible
Browse files Browse the repository at this point in the history
  • Loading branch information
benjaoming committed Dec 19, 2016
1 parent d500001 commit 562b4a4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion demo/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
"django.template.context_processors.static",
"django.template.context_processors.tz",
"django.contrib.messages.context_processors.messages",
'django.core.context_processors.request',
"django.template.context_processors.request",
]
}
},
Expand Down
10 changes: 5 additions & 5 deletions demo/urls.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from django.conf.urls import patterns, include, url
from django.conf.urls import include, url
from django.conf.urls.static import static
from django.conf import settings
from django.contrib import admin
Expand All @@ -13,18 +13,18 @@
wagtailsearch_register_signal_handlers()


urlpatterns = patterns('',
urlpatterns = [
url(r'^blog/', include('blog.urls', namespace="blog")),
url(r'^django-admin/', include(admin.site.urls)),
url(r'^admin/', include(wagtailadmin_urls)),
url(r'^comments/', include('django_comments_xtd.urls')),
url(r'', include(wagtail_urls)),
)
]

if settings.DEBUG:
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
urlpatterns += staticfiles_urlpatterns()
urlpatterns += static(settings.MEDIA_URL + 'images/', document_root=os.path.join(settings.MEDIA_ROOT, 'images'))
urlpatterns += patterns('',
urlpatterns += [
(r'^favicon\.ico$', RedirectView.as_view(url=settings.STATIC_URL + 'demo/images/favicon.ico'))
)
]

0 comments on commit 562b4a4

Please sign in to comment.