Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.6.x] Propagate get_user_model exception from get_user

Fixes #21439

Backport of 3560ef0 from master.

Conflicts:
	django/contrib/auth/tests/test_auth_backends.py
  • Loading branch information...
commit 0aa06bd3782d1bf6961ba846ec79aded82daa5c2 1 parent c37b2e4
Matt Robenolt mattrobenolt authored aaugustin committed
2  django/contrib/auth/backends.py
View
@@ -64,8 +64,8 @@ def has_module_perms(self, user_obj, app_label):
return False
def get_user(self, user_id):
+ UserModel = get_user_model()
try:
- UserModel = get_user_model()
return UserModel._default_manager.get(pk=user_id)
except UserModel.DoesNotExist:
return None
24 django/contrib/auth/tests/test_auth_backends.py
View
@@ -480,3 +480,27 @@ def test_changed_backend_settings(self):
# anonymous as the backend is not longer available.
self.assertIsNotNone(user)
self.assertTrue(user.is_anonymous())
+
+
+@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)
Please sign in to comment.
Something went wrong with that request. Please try again.