Ticket #17236: 17236_v2.diff

File 17236_v2.diff, 1.1 KB (added by Christopher Medrela, 13 years ago)

  • django/contrib/auth/__init__.py 

    diff --git a/django/contrib/auth/__init__.py b/django/contrib/auth/__init__.py
index 141cac7..567882a 100644
    a b def authenticate(**credentials):  
    5555def login(request, user):
    5656    """
    5757    Persist a user id and a backend in the request. This way a user doesn't
    58     have to reauthenticate on every request.
     58    have to reauthenticate on every request. Note that data set during
     59    the anonymous session is retained when you log in.
    5960    """
    6061    if user is None:
    6162        user = request.user

  • docs/topics/auth.txt 

    diff --git a/docs/topics/auth.txt b/docs/topics/auth.txt
index 63fe70f..7cb9a84 100644
    a b Django provides two functions in :mod:`django.contrib.auth`:  
    598598    using Django's session framework, so, as mentioned above, you'll need to
    599599    make sure to have the session middleware installed.
    600600
     601    Note that data set during the anonymous session is retained when you log in.
     602
    601603    This example shows how you might use both
    602604    :func:`~django.contrib.auth.authenticate()` and
    603605    :func:`~django.contrib.auth.login()`::
Back to Top