p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Made modwsgi groups_for_user consistent with check_password 

2b5f848207 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
This commit is contained in:
Preston Holmes 2013-02-09 09:30:26 -08:00
parent 718afcafc2
commit 0e18fb04ba
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/contrib/auth/handlers/modwsgi.py
View File

@ -40,11 +40,7 @@ def groups_for_user(environ, username):
user = UserModel._default_manager.get_by_natural_key(username) user = UserModel._default_manager.get_by_natural_key(username)
except UserModel.DoesNotExist: except UserModel.DoesNotExist:
return [] return []
try: if not user.is_active:
if not user.is_active:
return []
except AttributeError as e:
# a custom user may not support is_active
return [] return []
return [force_bytes(group.name) for group in user.groups.all()] return [force_bytes(group.name) for group in user.groups.all()]
finally: finally: