mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-16 17:09:12 +00:00
Code Issues 32 Releases Wiki Activity

[1.5.x] Propagate get_user_model exception from get_user

Browse Source 
Fixes #21439

Backport of 3560ef04 from master.

Conflicts:
	django/contrib/auth/tests/auth_backends.py
This commit is contained in:
Matt Robenolt 2013-11-14 11:55:13 -08:00 committed by Aymeric Augustin
parent 8d1f339667
commit 16e5fdd9cb
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/auth/backends.py
View File

@ -62,8 +62,8 @@ class ModelBackend(object):
return False return False
def get_user(self, user_id): def get_user(self, user_id):
UserModel = get_user_model()
try: try:
UserModel = get_user_model()
return UserModel._default_manager.get(pk=user_id) return UserModel._default_manager.get(pk=user_id)
except UserModel.DoesNotExist: except UserModel.DoesNotExist:
return None return None

24
django/contrib/auth/tests/auth_backends.py
View File

@ -367,3 +367,27 @@ class InActiveUserBackendTest(TestCase):
def test_has_module_perms(self): def test_has_module_perms(self):
self.assertEqual(self.user1.has_module_perms("app1"), False) self.assertEqual(self.user1.has_module_perms("app1"), False)
self.assertEqual(self.user1.has_module_perms("app2"), False) self.assertEqual(self.user1.has_module_perms("app2"), False)
@skipIfCustomUser
class ImproperlyConfiguredUserModelTest(TestCase):
"""
Tests that an exception from within get_user_model is propagated and doesn't
raise an UnboundLocalError.
Regression test for ticket #21439
"""
def setUp(self):
self.user1 = User.objects.create_user('test', 'test@example.com', 'test')
self.client.login(
username='test',
password='test'
)
@override_settings(AUTH_USER_MODEL='thismodel.doesntexist')
def test_does_not_shadow_exception(self):
# Prepare a request object
request = HttpRequest()
request.session = self.client.session
self.assertRaises(ImproperlyConfigured, get_user, request)