From 9890f55ba51db1f5779d61d2e71448229eaa1deb Mon Sep 17 00:00:00 2001
From: Daniel Levy <daniell@aptivate.org>
Date: Tue, 9 Jun 2015 09:28:25 +0100
Subject: [PATCH] Explicitly set 'permanent' on RedirectView
This eliminates warnings about the default value for this attribute
changing.
---
django/website/urls.py | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/django/website/urls.py b/django/website/urls.py
index 80146bda..44fa5fae 100644
--- a/django/website/urls.py
+++ b/django/website/urls.py
@@ -10,7 +10,8 @@ from django.conf import settings
admin.autodiscover()
-urlpatterns = patterns('',
+urlpatterns = patterns(
+ '',
# Examples:
# url(r'^$', 'myapp.views.home', name='home'),
# url(r'^myapp/', include('myapp.urls')),
@@ -25,9 +26,15 @@ urlpatterns = patterns('',
)
if settings.DEBUG:
- urlpatterns = patterns('',
- url(r'^uploads/(?P<path>.*)$', 'django.views.static.serve',
- {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
+ urlpatterns = patterns(
+ '',
+ url(
+ r'^uploads/(?P<path>.*)$', 'django.views.static.serve',
+ {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}
+ ),
url(r'', include('django.contrib.staticfiles.urls')),
- (r'^favicon.ico$', RedirectView.as_view(url='{0}images/favicon.ico'.format(settings.STATIC_URL))),
+ url(r'^favicon.ico$', RedirectView.as_view(
+ url='{0}images/favicon.ico'.format(settings.STATIC_URL),
+ permanent=True
+ )),
) + urlpatterns
--
GitLab