Ticket #19075: 19075-2.diff

django/core/servers/basehttp.py

@@ -144 +144 @@
         env['SERVER_PROTOCOL'] = self.request_version
         env['REQUEST_METHOD'] = self.command
         if '?' in self.path:
-            path,query = self.path.split('?',1)
+            path,query = self.path.split(str('?'),1)
         else:
             path,query = self.path,''
 
         env['PATH_INFO'] = unquote(path)
         env['QUERY_STRING'] = query
         env['REMOTE_ADDR'] = self.client_address[0]
-        env['CONTENT_TYPE'] = self.headers.get('content-type', 'text/plain')
+        env['CONTENT_TYPE'] = self.headers.get('content-type', str('text/plain'))
 
         length = self.headers.get('content-length')
         if length:

tests/regressiontests/servers/tests.py

@@ +1 @@
+# -*- encoding: utf-8 -*-
 """
 Tests for django.core.servers.
 """
+from __future__ import unicode_literals
+
 import os
 try:
     from urllib.request import urlopen, HTTPError
@@ -11 +14 @@
 from django.test import LiveServerTestCase
 from django.core.servers.basehttp import WSGIServerException
 from django.test.utils import override_settings
+from django.utils.http import urlencode
 
 from .models import Person
 
@@ -134 +138 @@
         f = self.urlopen('/media/example_media_file.txt')
         self.assertEqual(f.read().rstrip(b'\r\n'), b'example media file')
 
+    def test_environ(self):
+        f = self.urlopen('/environ_view/?%s' % urlencode({'q': 'тест'}))
+        self.assertIn(b"QUERY_STRING: 'q=%D1%82%D0%B5%D1%81%D1%82'", f.read())
+
 
 class LiveServerDatabase(LiveServerBase):
 

tests/regressiontests/servers/urls.py

@@ -9 +9 @@
     url(r'^example_view/$', views.example_view),
     url(r'^model_view/$', views.model_view),
     url(r'^create_model_instance/$', views.create_model_instance),
-)
- No newline at end of file
+    url(r'^environ_view/$', views.environ_view),
+)

tests/regressiontests/servers/views.py

@@ -14 +14 @@
 def create_model_instance(request):
     person = Person(name='emily')
     person.save()
-    return HttpResponse('')
- No newline at end of file
+    return HttpResponse('')
+
+
+def environ_view(request):
+    return HttpResponse("\n".join(["%s: %r" % (k, v) for k, v in request.environ.items()]))