From 7368111c5b2a221a4c26d17efab86ec6f2a0c266 Mon Sep 17 00:00:00 2001 From: Sofia Papagiannaki Date: Mon, 19 Nov 2012 15:37:51 +0200 Subject: [PATCH] Update docstring for activation backends Refs: #3008 --- snf-astakos-app/astakos/im/activation_backends.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/snf-astakos-app/astakos/im/activation_backends.py b/snf-astakos-app/astakos/im/activation_backends.py index 7f6b5ae..cd70769 100644 --- a/snf-astakos-app/astakos/im/activation_backends.py +++ b/snf-astakos-app/astakos/im/activation_backends.py @@ -108,9 +108,6 @@ class ActivationBackend(object): ): """ If the user is already active returns immediately. - If the user is not active and there is another account associated with - the specific email, it sends an informative email to the user whether - wants to switch to this account. If the user is preaccepted and the email is verified, the account is activated automatically. Otherwise, if the email is not verified, it sends a verification email to the user. @@ -189,8 +186,8 @@ class InvitationsBackend(ActivationBackend): def _is_preaccepted(self, user): """ - If there is a valid, not-consumed invitation code for the specific user - returns True else returns False. + Extends _is_preaccepted and if there is a valid, not-consumed invitation + code for the specific user returns True else returns False. """ if super(InvitationsBackend, self)._is_preaccepted(user): return True -- 1.7.10.4