diff options
| author | Barry Warsaw | 2009-01-16 21:04:21 -0500 |
|---|---|---|
| committer | Barry Warsaw | 2009-01-16 21:04:21 -0500 |
| commit | ae3d0cc316b826b8325507d960ccf84da601c3b0 (patch) | |
| tree | 3485e2ca463c2131a0ffb1693bc60d569cc9d8b7 /mailman/chains/hold.py | |
| parent | a3f7d07c62b2f7d6ac9d0b700883826c2838db60 (diff) | |
| download | mailman-ae3d0cc316b826b8325507d960ccf84da601c3b0.tar.gz mailman-ae3d0cc316b826b8325507d960ccf84da601c3b0.tar.zst mailman-ae3d0cc316b826b8325507d960ccf84da601c3b0.zip | |
Diffstat (limited to 'mailman/chains/hold.py')
| -rw-r--r-- | mailman/chains/hold.py | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/mailman/chains/hold.py b/mailman/chains/hold.py index f46733304..16238a541 100644 --- a/mailman/chains/hold.py +++ b/mailman/chains/hold.py @@ -17,6 +17,8 @@ """The terminal 'hold' chain.""" +from __future__ import absolute_import, unicode_literals + __metaclass__ = type __all__ = [ 'HoldChain', @@ -91,14 +93,14 @@ class HoldChain(TerminalChainBase): original_subject = _('(no subject)') else: original_subject = oneline(original_subject, charset) - substitutions = { - 'listname' : mlist.fqdn_listname, - 'subject' : original_subject, - 'sender' : sender, - 'reason' : 'XXX', #reason, - 'confirmurl' : '%s/%s' % (mlist.script_url('confirm'), token), - 'admindb_url': mlist.script_url('admindb'), - } + substitutions = dict( + listname = mlist.fqdn_listname, + subject = original_subject, + sender = sender, + reason = 'XXX', #reason, + confirmurl = '{0}/{1}'.format(mlist.script_url('confirm'), token), + admindb_url = mlist.script_url('admindb'), + ) # At this point the message is held, but now we have to craft at least # two responses. The first will go to the original author of the # message and it will contain the token allowing them to approve or @@ -167,7 +169,7 @@ also appear in the first line of the body of the reply.""")), nmsg.attach(text) nmsg.attach(MIMEMessage(msg)) nmsg.attach(MIMEMessage(dmsg)) - nmsg.send(mlist, **{'tomoderators': 1}) + nmsg.send(mlist, **dict(tomoderators=True)) # Log the held message # XXX reason reason = 'n/a' |
