Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Propagate get_user_model exception from get_user #1920

Merged
merged 1 commit into from

2 participants

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Nov 14, 2013
  1. @mattrobenolt
This page is out of date. Refresh to see the latest.
View
2  django/contrib/auth/backends.py
@@ -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
View
24 django/contrib/auth/tests/test_auth_backends.py
@@ -508,3 +508,27 @@ def setUp(self):
@override_settings(AUTHENTICATION_BACKENDS=(backend, ))
def test_type_error_raised(self):
self.assertRaises(TypeError, authenticate, username='test', password='test')
+
+
+@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)
Something went wrong with that request. Please try again.