Removed custom WSGIRequestHandler.get_environ

We probably historically customized it for good reasons, but
currently, the differences with upstream Python are not
significant any longer.
Also fixes #19075 for which a test has been added.

3 files changed, 15 insertions, 2 deletions

diff --git a/tests/regressiontests/servers/tests.py b/tests/regressiontests/servers/tests.py
index c90c785a6e..f54e34ce28 100644
--- a/tests/regressiontests/servers/tests.py
+++ b/tests/regressiontests/servers/tests.py
@@ -1,6 +1,9 @@
+# -*- encoding: utf-8 -*-
 """
 Tests for django.core.servers.
 """
+from __future__ import unicode_literals
+
 import os
 try:
     from urllib.request import urlopen, HTTPError
@@ -11,6 +14,7 @@ from django.core.exceptions import ImproperlyConfigured
 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,6 +138,10 @@ class LiveServerViews(LiveServerBase):
         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):
 
diff --git a/tests/regressiontests/servers/urls.py b/tests/regressiontests/servers/urls.py
index c8ca1ac7a4..a857c45f95 100644
--- a/tests/regressiontests/servers/urls.py
+++ b/tests/regressiontests/servers/urls.py
@@ -9,4 +9,5 @@ urlpatterns = patterns('',
     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),
+)
diff --git a/tests/regressiontests/servers/views.py b/tests/regressiontests/servers/views.py
index 94a4f2d9ef..00baf4b5ac 100644
--- a/tests/regressiontests/servers/views.py
+++ b/tests/regressiontests/servers/views.py
@@ -14,4 +14,8 @@ def model_view(request):
 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()]))