diff options
| author | Anirudh Dahiya | 2016-03-13 02:39:04 +0530 |
|---|---|---|
| committer | Barry Warsaw | 2016-03-22 20:36:46 -0400 |
| commit | 99b8c0bd9fb4282dc2a692e236ebb7d8747af037 (patch) | |
| tree | 51c62d582a93f24ba7e4d39b36b9a3e4ada4d6df /src | |
| parent | c0cf3c711cfc3eddf5677baf4238e12f71598b0a (diff) | |
| download | mailman-99b8c0bd9fb4282dc2a692e236ebb7d8747af037.tar.gz mailman-99b8c0bd9fb4282dc2a692e236ebb7d8747af037.tar.zst mailman-99b8c0bd9fb4282dc2a692e236ebb7d8747af037.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/mailman/app/subscriptions.py | 8 | ||||
| -rw-r--r-- | src/mailman/interfaces/subscriptions.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mailman/app/subscriptions.py b/src/mailman/app/subscriptions.py index e901e1922..6a414c26a 100644 --- a/src/mailman/app/subscriptions.py +++ b/src/mailman/app/subscriptions.py @@ -39,7 +39,7 @@ from mailman.interfaces.mailinglist import SubscriptionPolicy from mailman.interfaces.member import MembershipIsBannedError from mailman.interfaces.pending import IPendable, IPendings from mailman.interfaces.registrar import ConfirmationNeededEvent -from mailman.interfaces.subscriptions import ISubscriptionService,SubscriptionPendingError,TokenOwner +from mailman.interfaces.subscriptions import ISubscriptionService, SubscriptionPendingError, TokenOwner from mailman.interfaces.user import IUser from mailman.interfaces.usermanager import IUserManager from mailman.interfaces.workflow import IWorkflowStateManager @@ -187,9 +187,9 @@ class SubscriptionWorkflow(Workflow): raise MembershipIsBannedError(self.mlist, self.address.email) # Check if the request for this email is already pending under # moderation - pendings = getUtility(IPendings).find(mlist=self.mlist,pend_type='subscription') - for token,pendable in pendings: - if pendable['email']==self.address.email and pendable['token_owner']=='moderator': + pendings = getUtility(IPendings).find(mlist = self.mlist,pend_type = 'subscription') + for token, pendable in pendings: + if pendable['email'] == self.address.email and pendable['token_owner'] == 'moderator': raise SubscriptionPendingError(self.address.email, self.mlist) # Start out with the subscriber being the token owner. self.push('verification_checks') diff --git a/src/mailman/interfaces/subscriptions.py b/src/mailman/interfaces/subscriptions.py index d7f31a381..9ab40291c 100644 --- a/src/mailman/interfaces/subscriptions.py +++ b/src/mailman/interfaces/subscriptions.py @@ -53,7 +53,7 @@ class SubscriptionPendingError(MailmanError): self.list_id = list_id def __str__(self): - return 'Subscription request for email {0} is pending for mailing list {1}'.format( + return 'Subscription request for email {} is pending for mailing list {}'.format( self.email,self.list_id.fqdn_listname) class TooManyMembersError(MembershipError): |