Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.6.x] Fixed #20530 -- Properly decoded non-ASCII query strings on P…

…ython 3.

Thanks mitsuhiko for the report.

Backport of 65b6eff and adaptation of 8aaca65 from master.
  • Loading branch information...
commit 7fcd6aa6695b39370154d6993cdbb3ba4363de91 1 parent 9244447
@aaugustin aaugustin authored
Showing with 17 additions and 1 deletion.
  1. +4 −1 django/core/handlers/wsgi.py
  2. +13 −0 tests/handlers/tests.py
View
5 django/core/handlers/wsgi.py
@@ -132,7 +132,10 @@ def _get_request(self):
def _get_get(self):
if not hasattr(self, '_get'):
# The WSGI spec says 'QUERY_STRING' may be absent.
- self._get = http.QueryDict(self.environ.get('QUERY_STRING', ''), encoding=self._encoding)
+ raw_query_string = self.environ.get('QUERY_STRING', str(''))
+ if six.PY3:
+ raw_query_string = raw_query_string.encode('iso-8859-1').decode('utf-8')
+ self._get = http.QueryDict(raw_query_string, encoding=self._encoding)
return self._get
def _set_get(self, get):
View
13 tests/handlers/tests.py
@@ -41,6 +41,16 @@ def test_bad_path_info(self):
response = handler(environ, lambda *a, **k: None)
self.assertEqual(response.status_code, 400)
+ def test_non_ascii_query_string(self):
+ """Test that non-ASCII query strings are properly decoded (#20530)."""
+ environ = RequestFactory().get('/').environ
+ raw_query_string = 'want=café'
+ if six.PY3:
+ raw_query_string = raw_query_string.encode('utf-8').decode('iso-8859-1')
+ environ['QUERY_STRING'] = raw_query_string
+ request = WSGIRequest(environ)
+ self.assertEqual(request.GET['want'], "café")
+
def test_non_ascii_cookie(self):
"""Test that non-ASCII cookies set in JavaScript are properly decoded (#20557)."""
environ = RequestFactory().get('/').environ
@@ -49,6 +59,9 @@ def test_non_ascii_cookie(self):
raw_cookie = raw_cookie.encode('utf-8').decode('iso-8859-1')
environ['HTTP_COOKIE'] = raw_cookie
request = WSGIRequest(environ)
+ # If would be nicer if request.COOKIES returned unicode values.
+ # However the current cookie parser doesn't do this and fixing it is
+ # much more work than fixing #20557. Feel free to remove force_str()!
self.assertEqual(request.COOKIES['want'], force_str("café"))
Please sign in to comment.
Something went wrong with that request. Please try again.