Ticket #10267: 10267.diff

django/views/generic/simple.py

@@ -1 +1 @@
 from django.template import loader, RequestContext
 from django.http import HttpResponse, HttpResponseRedirect, HttpResponsePermanentRedirect, HttpResponseGone
+from django.utils.encoding import iri_to_url
 
 def direct_to_template(request, template, extra_context=None, mimetype=None, **kwargs):
     """
@@ -36 +37 @@
     """
     if url is not None:
         klass = permanent and HttpResponsePermanentRedirect or HttpResponseRedirect
-        return klass(url % kwargs)
+        return klass(iri_to_url(url % kwargs))
     else:
         return HttpResponseGone()

django/contrib/redirects/middleware.py

@@ -1 +1 @@
 from django.contrib.redirects.models import Redirect
+from django.utils.encoding import iri_to_url
 from django import http
 from django.conf import settings
 
@@ -21 +22 @@
         if r is not None:
             if r.new_path == '':
                 return http.HttpResponseGone()
-            return http.HttpResponsePermanentRedirect(r.new_path)
+            return http.HttpResponsePermanentRedirect(iri_to_url(r.new_path))
 
         # No redirect was found. Return the response.
         return response