Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix Python 3 test failure introduced in a78dd10.

  • Loading branch information...
commit 75ef980e20fc0441aedb0645aa471c9fe606e3b0 1 parent ffe8bc0
@carljm carljm authored
Showing with 5 additions and 2 deletions.
  1. +5 −2 django/contrib/auth/decorators.py
View
7 django/contrib/auth/decorators.py
@@ -24,7 +24,9 @@ def _wrapped_view(request, *args, **kwargs):
if test_func(request.user):
return view_func(request, *args, **kwargs)
path = request.build_absolute_uri()
- resolved_login_url = resolve_url(login_url or settings.LOGIN_URL)
+ # urlparse chokes on lazy objects in Python 3, force to str
+ resolved_login_url = force_str(
+ resolve_url(login_url or settings.LOGIN_URL))
# If the login url is the same scheme and net location then just
# use the path as the "next" url.
login_scheme, login_netloc = urlparse(resolved_login_url)[:2]
@@ -33,7 +35,8 @@ def _wrapped_view(request, *args, **kwargs):
(not login_netloc or login_netloc == current_netloc)):
path = request.get_full_path()
from django.contrib.auth.views import redirect_to_login
- return redirect_to_login(path, login_url, redirect_field_name)
+ return redirect_to_login(
+ path, resolved_login_url, redirect_field_name)
return _wrapped_view
return decorator
Please sign in to comment.
Something went wrong with that request. Please try again.