Small edits to comments in contrib/auth/__init__.py
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3257 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
37aeabe71f
commit
435e8910ae
|
@ -27,17 +27,17 @@ def get_backends():
|
||||||
|
|
||||||
def authenticate(**credentials):
|
def authenticate(**credentials):
|
||||||
"""
|
"""
|
||||||
If the given credentials, return a user object.
|
If the given credentials are valid, return a User object.
|
||||||
"""
|
"""
|
||||||
for backend in get_backends():
|
for backend in get_backends():
|
||||||
try:
|
try:
|
||||||
user = backend.authenticate(**credentials)
|
user = backend.authenticate(**credentials)
|
||||||
except TypeError:
|
except TypeError:
|
||||||
# this backend doesn't accept these credentials as arguments, try the next one.
|
# This backend doesn't accept these credentials as arguments. Try the next one.
|
||||||
continue
|
continue
|
||||||
if user is None:
|
if user is None:
|
||||||
continue
|
continue
|
||||||
# annotate the user object with the path of the backend
|
# Annotate the user object with the path of the backend.
|
||||||
user.backend = str(backend.__class__)
|
user.backend = str(backend.__class__)
|
||||||
return user
|
return user
|
||||||
|
|
||||||
|
@ -54,7 +54,7 @@ def login(request, user):
|
||||||
|
|
||||||
def logout(request):
|
def logout(request):
|
||||||
"""
|
"""
|
||||||
Remove the authenticated user's id from request.
|
Remove the authenticated user's ID from the request.
|
||||||
"""
|
"""
|
||||||
del request.session[SESSION_KEY]
|
del request.session[SESSION_KEY]
|
||||||
del request.session[BACKEND_SESSION_KEY]
|
del request.session[BACKEND_SESSION_KEY]
|
||||||
|
|
Loading…
Reference in New Issue