diff options
| author | Chris McDonough <chrism@plope.com> | 2013-10-30 20:14:52 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-10-30 20:14:52 -0400 |
| commit | e1838557e6721b5b42f1267b134b626099703c2c (patch) | |
| tree | d4ab71b5a728ef3b30b46828dd768ceee91aaf24 | |
| parent | 63f7ae00096e1121504d43ddcbefbd1e5293a985 (diff) | |
| download | pyramid-e1838557e6721b5b42f1267b134b626099703c2c.tar.gz pyramid-e1838557e6721b5b42f1267b134b626099703c2c.tar.bz2 pyramid-e1838557e6721b5b42f1267b134b626099703c2c.zip | |
not methods, attrs
| -rw-r--r-- | docs/api/request.rst | 4 | ||||
| -rw-r--r-- | pyramid/security.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/api/request.rst b/docs/api/request.rst index 3d1fe020c..661cdfc91 100644 --- a/docs/api/request.rst +++ b/docs/api/request.rst @@ -171,7 +171,7 @@ A property which returns the userid of the currently authenticated user or ``None`` if there is no :term:`authentication policy` in effect or there is no currently authenticated user. This differs from - :meth:`~pyramid.request.Request.unauthenticated_userid`, because the + :attr:`~pyramid.request.Request.unauthenticated_userid`, because the effective authentication policy will have ensured that a record associated with the userid exists in persistent storage; if it has not, this value will be ``None``. @@ -184,7 +184,7 @@ verified) user id of the credentials present in the request. ``None`` if there is no :term:`authentication policy` in effect or there is no user data associated with the current request. This differs from - :meth:`~pyramid.request.Request.authenticated_userid`, because the + :attr:`~pyramid.request.Request.authenticated_userid`, because the effective authentication policy will not ensure that a record associated with the userid exists in persistent storage. Even if the userid does not exist in persistent storage, this value will be the value diff --git a/pyramid/security.py b/pyramid/security.py index f7750cbef..a5d9c52eb 100644 --- a/pyramid/security.py +++ b/pyramid/security.py @@ -345,9 +345,9 @@ class AuthenticationAPIMixin(object): id of the credentials present in the request. ``None`` if there is no :term:`authentication policy` in effect or there is no user data associated with the current request. This differs from - :func:`~pyramid.security.authenticated_userid`, because the effective - authentication policy will not ensure that a record associated with the - userid exists in persistent storage. + :attr:`~pyramid.request.Request.authenticated_userid`, because the + effective authentication policy will not ensure that a record + associated with the userid exists in persistent storage. .. versionadded:: 1.5 """ |