Fixed #13304 -- Updated auth decorators so they can be used with callable... (056c940f) · Commits · Dom Sekotill / django

django/contrib/auth/decorators.py

+2 −1

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@ except ImportError:

		from django.contrib.auth import REDIRECT_FIELD_NAME
		from django.http import HttpResponseRedirect
		from django.utils.decorators import available_attrs
		from django.utils.http import urlquote


		@@ -25,7 +26,7 @@ def user_passes_test(test_func, login_url=None, redirect_field_name=REDIRECT_FIE
		path = urlquote(request.get_full_path())
		tup = login_url, redirect_field_name, path
		return HttpResponseRedirect('%s?%s=%s' % tup)
		return wraps(view_func)(_wrapped_view)
		return wraps(view_func, assigned=available_attrs(view_func))(_wrapped_view)
		return decorator

+5 −4

Original line number	Diff line number	Diff line
		from django.contrib.auth.tests.auth_backends import BackendTest, RowlevelBackendTest, AnonymousUserBackendTest, NoAnonymousUserBackendTest
		from django.contrib.auth.tests.basic import BASIC_TESTS
		from django.contrib.auth.tests.views \
		import PasswordResetTest, ChangePasswordTest, LoginTest, LogoutTest
		from django.contrib.auth.tests.decorators import LoginRequiredTestCase
		from django.contrib.auth.tests.forms import FORM_TESTS
		from django.contrib.auth.tests.remote_user \
		import RemoteUserTest, RemoteUserNoCreateTest, RemoteUserCustomTest
		from django.contrib.auth.tests.auth_backends import BackendTest, RowlevelBackendTest, AnonymousUserBackendTest, NoAnonymousUserBackendTest
		from django.contrib.auth.tests.tokens import TOKEN_GENERATOR_TESTS
		from django.contrib.auth.tests.models import ProfileTestCase
		from django.contrib.auth.tests.tokens import TOKEN_GENERATOR_TESTS
		from django.contrib.auth.tests.views \
		import PasswordResetTest, ChangePasswordTest, LoginTest, LogoutTest

		# The password for the fixture data users is 'password'

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		from unittest import TestCase

		from django.contrib.auth.decorators import login_required


		class LoginRequiredTestCase(TestCase):
		"""
		Tests the login_required decorators
		"""
		def testCallable(self):
		"""
		Check that login_required is assignable to callable objects.
		"""
		class CallableView(object):
		def __call__(self, args, *kwargs):
		pass
		login_required(CallableView())

		def testView(self):
		"""
		Check that login_required is assignable to normal views.
		"""
		def normal_view(request):
		pass
		login_required(normal_view)
		No newline at end of file