------------------------------------------------------------
revno: 1361
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.2
timestamp: Fri 2014-11-07 17:22:26 -0800
message:
Catch the NotAMemberError exception thrown if an authenticated
unsubscribe is submitted from the user options page for a nonmember.
modified:
Mailman/Cgi/options.py
NEWS
--
lp:mailman/2.2
https://code.launchpad.net/~mailman-coders/mailman/2.2
Your team Mailman Checkins is subscribed to branch lp:mailman/2.2.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.2/+edit-subscription
=== modified file 'Mailman/Cgi/options.py'
--- Mailman/Cgi/options.py 2014-09-22 02:12:49 +0000
+++ Mailman/Cgi/options.py 2014-11-08 01:22:26 +0000
@@ -519,6 +519,13 @@
user, 'via the member options page', userack=1)
except Errors.MMNeedApproval:
needapproval = True
+ except Errors.NotAMemberError:
+ # MAS This except should really be in the outer try so we
+ # don't save the list redundantly, but except and finally in
+ # the same try requires Python >= 2.5.
+ # Setting a switch and making the Save() conditional doesn't
+ # seem worth it as the Save() won't change anything.
+ pass
mlist.Save()
finally:
mlist.Unlock()
=== modified file 'NEWS'
--- NEWS 2014-11-04 23:00:35 +0000
+++ NEWS 2014-11-08 01:22:26 +0000
@@ -77,6 +77,10 @@
Bug fixes and other patches
+ - We now catch the NotAMemberError exception thrown if an authenticated
+ unsubscribe is submitted from the user options page for a nonmember.
+ (LP: #1390653)
+
- Fixed an archiving bug that would cause messages with 'Subject: Re:'
only to be indexed in the archives without a link to the message.
(LP: #1388614)
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
