From 528cc2f850f3c8c4340f5e22f78da45520e2f1c4 Mon Sep 17 00:00:00 2001
From: bwarsaw
Date: Mon, 2 Dec 2002 14:29:24 +0000
Subject: subscription_confirm(), unsubscription_confirm(),
 addrchange_confirm(), reenable_confirm(): MMNoSuchUserError ->
 NotAMemberError

---
 Mailman/Cgi/confirm.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Mailman/Cgi/confirm.py b/Mailman/Cgi/confirm.py
index 58e0642bb..b1583dc11 100644
--- a/Mailman/Cgi/confirm.py
+++ b/Mailman/Cgi/confirm.py
@@ -335,7 +335,7 @@ def subscription_confirm(mlist, doc, cookie, cgidata):
             the list moderator before you will be subscribed.  Your request
             has been forwarded to the list moderator, and you will be notified
             of the moderator's decision."""))
-        except Errors.MMNoSuchUserError:
+        except Errors.NotAMemberError:
             bad_confirmation(doc, _('''Invalid confirmation string.  It is
             possible that you are attempting to confirm a request for an
             address that has already been unsubscribed.'''))
@@ -390,7 +390,7 @@ def unsubscription_confirm(mlist, doc, cookie):
             i18n.set_language(lang)
             doc.set_language(lang)
             op, addr = mlist.ProcessConfirmation(cookie)
-        except Errors.MMNoSuchUserError:
+        except Errors.NotAMemberError:
             bad_confirmation(doc, _('''Invalid confirmation string.  It is
             possible that you are attempting to confirm a request for an
             address that has already been unsubscribed.'''))
@@ -478,7 +478,7 @@ def addrchange_confirm(mlist, doc, cookie):
             i18n.set_language(lang)
             doc.set_language(lang)
             op, oldaddr, newaddr = mlist.ProcessConfirmation(cookie)
-        except Errors.MMNoSuchUserError:
+        except Errors.NotAMemberError:
             bad_confirmation(doc, _('''Invalid confirmation string.  It is
             possible that you are attempting to confirm a request for an
             address that has already been unsubscribed.'''))
@@ -701,7 +701,7 @@ def reenable_confirm(mlist, doc, cookie):
             i18n.set_language(lang)
             doc.set_language(lang)
             op, addr = mlist.ProcessConfirmation(cookie)
-        except Errors.MMNoSuchUserError:
+        except Errors.NotAMemberError:
             bad_confirmation(doc, _('''Invalid confirmation string.  It is
             possible that you are attempting to confirm a request for an
             address that has already been unsubscribed.'''))
-- 
cgit v1.3.1