Ticket #24097: 24097_lazy.diff

django/contrib/auth/tests/test_views.py

@@ +1 @@
+# -*- coding: utf-8 -*-
 from importlib import import_module
 import itertools
 import re
@@ -10 +11 @@
 from django.contrib.auth.forms import (AuthenticationForm, PasswordChangeForm,
     SetPasswordForm)
 from django.contrib.auth.models import User
-from django.contrib.auth.views import login as login_view
+from django.contrib.auth.views import login as login_view, redirect_to_login
 from django.core import mail
-from django.core.urlresolvers import reverse, NoReverseMatch
+from django.core.urlresolvers import NoReverseMatch, reverse, reverse_lazy
 from django.http import QueryDict, HttpRequest
 from django.utils.deprecation import RemovedInDjango20Warning
 from django.utils.encoding import force_text
@@ -673 +674 @@
         self.assertLoginRedirectURLEqual('http://remote.example.com/welcome/')
 
 
+class LazyLoginURLTest(AuthViewsTestCase):
+    def test_redirect_to_login(self):
+        with self.settings(LOGIN_URL=reverse_lazy('login')):
+            login_redirect_response = redirect_to_login(next='/else/where/')
+            expected = '/login/?next=/else/where/'
+            self.assertEquals(expected, login_redirect_response.url)
+
+    def test_redirect_to_login_with_unicode(self):
+        with self.settings(LOGIN_URL=reverse_lazy('login')):
+            login_redirect_response = redirect_to_login(next='/else/where/झ/')
+            expected = '/login/?next=/else/where/%E0%A4%9D/'
+            self.assertEquals(expected, login_redirect_response.url)
+
+
 @skipIfCustomUser
 class LogoutTest(AuthViewsTestCase):
 

django/contrib/auth/views.py

@@ -125 +125 @@
 
     login_url_parts = list(urlparse(resolved_url))
     if redirect_field_name:
-        querystring = QueryDict(login_url_parts[4], mutable=True)
+        old_querystring = login_url_parts[4]
+        querystring = QueryDict(old_querystring, mutable=True)
         querystring[redirect_field_name] = next
-        login_url_parts[4] = querystring.urlencode(safe='/')
+        new_querystring = querystring.urlencode(safe='/')
+        if isinstance(old_querystring, bytes):
+            # login_url_parts must be all str / all bytes, not a mix in Python3
+            new_querystring = new_querystring.encode('utf-8')
+        login_url_parts[4] = new_querystring
 
     return HttpResponseRedirect(urlunparse(login_url_parts))
 

django/utils/functional.py

@@ -182 +182 @@
             memo[id(self)] = self
             return self
 
+        def decode(self, encoding='ascii', errors='strict'):
+            """
+            Turn into a string as that's what Python 3 code usually wants,
+            e.g. to pass the _coerce_args function in urlparse.
+
+            :param encoding: So urllib.parse._decode_args works with this.
+            :param errors: So urllib.parse._decode_args works with this.
+            """
+            return str(self)
+
     @wraps(func)
     def __wrapper__(*args, **kw):
         # Creates the proxy object, instead of the actual value.