Ticket #16842: django-redirects-querystring.patch

tests/regressiontests/generic_views/base.py

@@ -256 +256 @@
         self.assertEqual(response.status_code, 301)
         self.assertEqual(response['Location'], '/bar/?pork=spam')
 
+    def test_include_urlencoded_args(self):
+        "GET arguments can be URL-encoded when included in the redirected URL"
+        response = RedirectView.as_view(url='/bar/', query_string=True)(self.rf.get('/foo/?unicode=%E2%9C%93'))
+        self.assertEqual(response.status_code, 301)
+        self.assertEqual(response['Location'], '/bar/?unicode=%E2%9C%93')
+
     def test_parameter_substitution(self):
         "Redirection URLs can be parameterized"
         response = RedirectView.as_view(url='/bar/%(object_id)d/')(self.rf.get('/foo/42/'), object_id=42)

django/views/generic/simple.py

@@ -48 +48 @@
     from the request is appended to the URL.
 
     """
-    args = request.META["QUERY_STRING"]
-    if args and query_string and url is not None:
-        url = "%s?%s" % (url, args)
+    if url is not None:
+        url = url % kwargs
+        args = request.META["QUERY_STRING"]
+        if args and query_string:
+            url = "%s?%s" % (url, args)
 
-    if url is not None:
         klass = permanent and HttpResponsePermanentRedirect or HttpResponseRedirect
-        return klass(url % kwargs)
+        return klass(url)
     else:
         logger.warning('Gone: %s' % request.path,
                     extra={

django/views/generic/base.py

@@ -138 +138 @@
         are provided as kwargs to this method.
         """
         if self.url:
+            url = self.url % kwargs
             args = self.request.META["QUERY_STRING"]
             if args and self.query_string:
-                url = "%s?%s" % (self.url, args)
-            else:
-                url = self.url
-            return url % kwargs
+                url = "%s?%s" % (url, args)
+            return url
         else:
             return None