------------------------------------------------------------
revno: 1147
committer: Mark Sapiro <[email protected]>
branch nick: 2.2
timestamp: Mon 2011-02-07 12:45:08 -0800
message:
- Fixed an uncaught KeyError when poster tries to cancel a post which was
already handled. Bug #266224.
modified:
Mailman/Cgi/confirm.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/confirm.py'
--- Mailman/Cgi/confirm.py 2010-03-29 20:47:23 +0000
+++ Mailman/Cgi/confirm.py 2011-02-07 20:45:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2010 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2011 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -635,6 +635,7 @@
try:
# Do this in two steps so we can get the preferred language for
# the user who posted the message.
+ subject = 'n/a'
op, id = mlist.pend_confirm(cookie)
ign, sender, msgsubject, ign, ign, ign = mlist.GetRecord(id)
lang = mlist.getMemberLanguage(sender)
@@ -645,7 +646,7 @@
# Discard the message
mlist.HandleRequest(id, mm_cfg.DISCARD,
_('Sender discarded message via web.'))
- except Errors.LostHeldMessage:
+ except (Errors.LostHeldMessage, KeyError):
bad_confirmation(doc, _('''The held message with the Subject:
header <em>%(subject)s</em> could not be found. The most likely
reason for this is that the list moderator has already approved or
=== modified file 'NEWS'
--- NEWS 2011-02-07 20:11:58 +0000
+++ NEWS 2011-02-07 20:45:08 +0000
@@ -104,6 +104,9 @@
Bug Fixes and other patches
+ - Fixed an uncaught KeyError when poster tries to cancel a post which was
+ already handled. Bug #266224.
+
- Held message user notifications now come From: list-owner instead of
list-bounces. Bug #714424.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
