From bc3c325683657d62a1d9864a289023ebccc779c8 Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Tue, 22 Mar 2016 21:56:53 -0400
Subject: Closes #199

New subscription requests are rejected if there is already one pending.
With thanks to Anirudh Dahiya.  (Closes #199)
---
 src/mailman/interfaces/subscriptions.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/mailman/interfaces/subscriptions.py')

diff --git a/src/mailman/interfaces/subscriptions.py b/src/mailman/interfaces/subscriptions.py
index 9ab40291c..5ce046a30 100644
--- a/src/mailman/interfaces/subscriptions.py
+++ b/src/mailman/interfaces/subscriptions.py
@@ -47,14 +47,11 @@ class MissingUserError(MailmanError):
 
 
 class SubscriptionPendingError(MailmanError):
-    def __init__(self, email, list_id):
+    def __init__(self, mlist, email):
         super().__init__()
+        self.mlist = mlist
         self.email = email
-        self.list_id = list_id
-        
-    def __str__(self):
-        return 'Subscription request for email {} is pending for mailing list {}'.format(
-            self.email,self.list_id.fqdn_listname)
+
 
 class TooManyMembersError(MembershipError):
     def __init__(self, subscriber, list_id, role):
@@ -63,6 +60,7 @@ class TooManyMembersError(MembershipError):
         self.list_id = list_id
         self.role = role
 
+
 
 _RequestRecord = namedtuple(
     'RequestRecord',
-- 
cgit v1.2.3-70-g09d2