Skip to content

Commit

Permalink
Made modwsgi groups_for_user consistent with check_password
Browse files Browse the repository at this point in the history
2b5f848 based its changes on #19061
that made the is_active attribute mandatory for user models.
The try/except was not removed for the groups_for_user function.

refs #19780
  • Loading branch information
ptone committed Feb 9, 2013
1 parent 718afca commit 0e18fb0
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions django/contrib/auth/handlers/modwsgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,7 @@ def groups_for_user(environ, username):
user = UserModel._default_manager.get_by_natural_key(username)
except UserModel.DoesNotExist:
return []
try:
if not user.is_active:
return []
except AttributeError as e:
# a custom user may not support is_active
if not user.is_active:
return []
return [force_bytes(group.name) for group in user.groups.all()]
finally:
Expand Down

0 comments on commit 0e18fb0

Please sign in to comment.