Fixed #23960 -- Removed http.fix_location_header

Thanks Carl Meyer for the report and Tim Graham for the review.

4 files changed, 5 insertions, 26 deletions

diff --git a/tests/view_tests/generic_urls.py b/tests/view_tests/generic_urls.py
index 9e73a07649..ee1c7d123b 100644
--- a/tests/view_tests/generic_urls.py
+++ b/tests/view_tests/generic_urls.py
@@ -32,7 +32,6 @@ urlpatterns = [
     url(r'^accounts/logout/$', auth_views.logout),
 
     # Special URLs for particular regression cases.
-    url('^中文/$', views.redirect),
     url('^中文/target/$', views.index_page),
 ]
 
diff --git a/tests/view_tests/tests/test_i18n.py b/tests/view_tests/tests/test_i18n.py
index ef11d7d82a..ae3025b5f1 100644
--- a/tests/view_tests/tests/test_i18n.py
+++ b/tests/view_tests/tests/test_i18n.py
@@ -31,7 +31,7 @@ class I18NTests(TestCase):
         for lang_code, lang_name in settings.LANGUAGES:
             post_data = dict(language=lang_code, next='/')
             response = self.client.post('/i18n/setlang/', data=post_data)
-            self.assertRedirects(response, 'http://testserver/')
+            self.assertRedirects(response, '/')
             self.assertEqual(self.client.session[LANGUAGE_SESSION_KEY], lang_code)
 
     def test_setlang_unsafe_next(self):
@@ -42,7 +42,7 @@ class I18NTests(TestCase):
         lang_code, lang_name = settings.LANGUAGES[0]
         post_data = dict(language=lang_code, next='//unsafe/redirection/')
         response = self.client.post('/i18n/setlang/', data=post_data)
-        self.assertEqual(response.url, 'http://testserver/')
+        self.assertEqual(response.url, '/')
         self.assertEqual(self.client.session[LANGUAGE_SESSION_KEY], lang_code)
 
     def test_setlang_reversal(self):
@@ -76,13 +76,13 @@ class I18NTests(TestCase):
             follow=True, HTTP_REFERER='/en/translated/'
         )
         self.assertEqual(self.client.session[LANGUAGE_SESSION_KEY], 'nl')
-        self.assertRedirects(response, 'http://testserver/nl/vertaald/')
+        self.assertRedirects(response, '/nl/vertaald/')
         # And reverse
         response = self.client.post(
             '/i18n/setlang/', data={'language': 'en'},
             follow=True, HTTP_REFERER='/nl/vertaald/'
         )
-        self.assertRedirects(response, 'http://testserver/en/translated/')
+        self.assertRedirects(response, '/en/translated/')
 
     def test_jsi18n(self):
         """The javascript_catalog can be deployed with language settings"""
diff --git a/tests/view_tests/tests/test_specials.py b/tests/view_tests/tests/test_specials.py
index 0af9033ae7..c8997ed57a 100644
--- a/tests/view_tests/tests/test_specials.py
+++ b/tests/view_tests/tests/test_specials.py
@@ -11,17 +11,6 @@ class URLHandling(TestCase):
     """
     redirect_target = "/%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 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('/中文/')
-        self.assertRedirects(response, self.redirect_target)
-
     def test_nonascii_redirect(self):
         """
         Tests that a non-ASCII argument to HttpRedirect is handled properly.
diff --git a/tests/view_tests/views.py b/tests/view_tests/views.py
index 4be67bfc6f..ad688573df 100644
--- a/tests/view_tests/views.py
+++ b/tests/view_tests/views.py
@@ -6,9 +6,7 @@ import sys
 
 from django.core.exceptions import PermissionDenied, SuspiciousOperation
 from django.core.urlresolvers import get_resolver
-from django.http import (
-    Http404, HttpResponse, HttpResponseRedirect, JsonResponse,
-)
+from django.http import Http404, HttpResponse, JsonResponse
 from django.shortcuts import render, render_to_response
 from django.template import TemplateDoesNotExist
 from django.utils.log import getLogger
@@ -71,13 +69,6 @@ class Http404View(View):
         raise Http404("Testing class-based technical 404.")
 
 
-def redirect(request):
-    """
-    Forces an HTTP redirect.
-    """
-    return HttpResponseRedirect("target/")
-
-
 def view_exception(request, n):
     raise BrokenException(except_args[int(n)])