summaryrefslogtreecommitdiff
path: root/macaroonbakery/identity.py
diff options
context:
space:
mode:
Diffstat (limited to 'macaroonbakery/identity.py')
-rw-r--r--macaroonbakery/identity.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/macaroonbakery/identity.py b/macaroonbakery/identity.py
index 23e2e4b..1579bba 100644
--- a/macaroonbakery/identity.py
+++ b/macaroonbakery/identity.py
@@ -2,7 +2,7 @@
# Licensed under the LGPLv3, see LICENCE file for details.
import abc
-import macaroonbakery
+import macaroonbakery as bakery
class Identity(object):
@@ -96,7 +96,7 @@ class IdentityClient(object):
(for example because of a database access error) - it's
OK to return all zero values when there's
no identity found and no third party to address caveats to.
- :param: ctx an AuthContext
+ @param ctx an AuthContext
:return: an Identity and array of caveats
'''
raise NotImplementedError('identity_from_context method must be '
@@ -107,8 +107,8 @@ class IdentityClient(object):
'''Parses the identity declaration from the given declared attributes.
TODO take the set of first party caveat conditions instead?
- :param: ctx (AuthContext)
- :param: declared (dict of string/string)
+ @param ctx (AuthContext)
+ @param declared (dict of string/string)
:return: an Identity
'''
raise NotImplementedError('declared_identity method must be '
@@ -123,4 +123,4 @@ class NoIdentities(IdentityClient):
return None, None
def declared_identity(self, ctx, declared):
- raise macaroonbakery.IdentityError('no identity declared or possible')
+ raise bakery.IdentityError('no identity declared or possible')