summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-04-17 17:00:39 -0400
committerChris McDonough <chrism@plope.com>2011-04-17 17:00:39 -0400
commit83c8ef87f1aba23350d2e044559bd33a580fd1b6 (patch)
treea67daa18bdab07a7893c69fc9a16922b5295e89c
parent158433b14b0db863f3246f74025b404487b5d0b8 (diff)
parent0ec72c912d9624e0b4f4b06b62422d3c3b1666a6 (diff)
downloadpyramid-83c8ef87f1aba23350d2e044559bd33a580fd1b6.tar.gz
pyramid-83c8ef87f1aba23350d2e044559bd33a580fd1b6.tar.bz2
pyramid-83c8ef87f1aba23350d2e044559bd33a580fd1b6.zip
refine; it really is a special kind of principal and it would not be correct to say 'no principals' (the userid is a principal id itself)
-rw-r--r--pyramid/authentication.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/pyramid/authentication.py b/pyramid/authentication.py
index 78349854b..a6c74e549 100644
--- a/pyramid/authentication.py
+++ b/pyramid/authentication.py
@@ -61,12 +61,12 @@ class RepozeWho1AuthenticationPolicy(CallbackAuthenticationPolicy):
``callback``
- Default: ``None``. A callback passed the :mod:`repoze.who`
- identity and the :term:`request`, expected to return ``None``
- if the user represented by the identity doesn't exist or a
- sequence of group identifiers (possibly empty) if the user
- does exist. If ``callback`` is None, the userid will be
- assumed to exist with no groups.
+ Default: ``None``. A callback passed the :mod:`repoze.who` identity
+ and the :term:`request`, expected to return ``None`` if the user
+ represented by the identity doesn't exist or a sequence of principal
+ identifiers (possibly empty) representing groups if the user does
+ exist. If ``callback`` is None, the userid will be assumed to exist
+ with no group principals.
Objects of this class implement the interface described by
:class:`pyramid.interfaces.IAuthenticationPolicy`.
@@ -149,10 +149,10 @@ class RemoteUserAuthenticationPolicy(CallbackAuthenticationPolicy):
``callback``
Default: ``None``. A callback passed the userid and the request,
- expected to return None if the userid doesn't exist or a sequence
- of group identifiers (possibly empty) if the user does exist.
- If ``callback`` is None, the userid will be assumed to exist with no
- groups.
+ expected to return None if the userid doesn't exist or a sequence of
+ principal identifiers (possibly empty) representing groups if the
+ user does exist. If ``callback`` is None, the userid will be assumed
+ to exist with no group principals.
Objects of this class implement the interface described by
:class:`pyramid.interfaces.IAuthenticationPolicy`.
@@ -187,9 +187,9 @@ class AuthTktAuthenticationPolicy(CallbackAuthenticationPolicy):
Default: ``None``. A callback passed the userid and the
request, expected to return ``None`` if the userid doesn't
- exist or a sequence of group identifiers (possibly empty) if
+ exist or a sequence of principal identifiers (possibly empty) if
the user does exist. If ``callback`` is ``None``, the userid
- will be assumed to exist with no groups. Optional.
+ will be assumed to exist with no principals. Optional.
``cookie_name``