Author: kmtracey
Date: 2010-03-02 13:37:48 -0600 (Tue, 02 Mar 2010)
New Revision: 12659
Modified:
django/trunk/django/http/__init__.py
django/trunk/tests/regressiontests/views/tests/specials.py
django/trunk/tests/regressiontests/views/urls.py
Log:
Fixed #11522: Restored ability of http redirect responses to correctly handle
redirect locations with non-ASCII chars.
Modified: django/trunk/django/http/__init__.py
===================================================================
--- django/trunk/django/http/__init__.py 2010-03-02 17:11:02 UTC (rev
12658)
+++ django/trunk/django/http/__init__.py 2010-03-02 19:37:48 UTC (rev
12659)
@@ -434,14 +434,14 @@
def __init__(self, redirect_to):
HttpResponse.__init__(self)
- self['Location'] = redirect_to
+ self['Location'] = iri_to_uri(redirect_to)
class HttpResponsePermanentRedirect(HttpResponse):
status_code = 301
def __init__(self, redirect_to):
HttpResponse.__init__(self)
- self['Location'] = redirect_to
+ self['Location'] = iri_to_uri(redirect_to)
class HttpResponseNotModified(HttpResponse):
status_code = 304
Modified: django/trunk/tests/regressiontests/views/tests/specials.py
===================================================================
--- django/trunk/tests/regressiontests/views/tests/specials.py 2010-03-02
17:11:02 UTC (rev 12658)
+++ django/trunk/tests/regressiontests/views/tests/specials.py 2010-03-02
19:37:48 UTC (rev 12659)
@@ -5,11 +5,31 @@
"""
Tests for URL handling in views and responses.
"""
- def test_iri_redirect(self):
+ redirect_target = "/views/%E4%B8%AD%E6%96%87/target/"
+
+ def test_combining_redirect(self):
"""
Tests that redirecting to an IRI, requiring encoding before we use it
- in an HTTP response, is handled correctly.
+ in an HTTP response, is handled correctly. In this case the arg to
+ HttpRedirect is ASCII but the current request path contains non-ASCII
+ characters so this test ensures the creation of the full path with a
+ base non-ASCII part is handled correctly.
"""
response = self.client.get(u'/views/中文/')
- self.assertRedirects(response, "/views/%E4%B8%AD%E6%96%87/target/")
+ self.assertRedirects(response, self.redirect_target)
+ def test_nonascii_redirect(self):
+ """
+ Tests that a non-ASCII argument to HttpRedirect is handled properly.
+ """
+ response = self.client.get('/views/nonascii_redirect/')
+ self.assertRedirects(response, self.redirect_target)
+
+ def test_permanent_nonascii_redirect(self):
+ """
+ Tests that a non-ASCII argument to HttpPermanentRedirect is handled
+ properly.
+ """
+ response = self.client.get('/views/permanent_nonascii_redirect/')
+ self.assertRedirects(response, self.redirect_target, status_code=301)
+
Modified: django/trunk/tests/regressiontests/views/urls.py
===================================================================
--- django/trunk/tests/regressiontests/views/urls.py 2010-03-02 17:11:02 UTC
(rev 12658)
+++ django/trunk/tests/regressiontests/views/urls.py 2010-03-02 19:37:48 UTC
(rev 12659)
@@ -97,3 +97,12 @@
urlpatterns += patterns('',
(r'^raises/$', views.raises)
)
+
+# rediriects, both temporary and permanent, with non-ASCII targets
+urlpatterns += patterns('django.views.generic.simple',
+ ('^nonascii_redirect/$', 'redirect_to',
+ {'url': u'/views/中文/target/', 'permanent': False}),
+ ('^permanent_nonascii_redirect/$', 'redirect_to',
+ {'url': u'/views/中文/target/', 'permanent': True}),
+)
+
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
