[PATCH] mail: fix regression introduced in dc6ed2736c81
Kirill Smelkov
kirr at mns.spb.ru
Wed Jan 23 13:05:05 CST 2008
# HG changeset patch
# User Kirill Smelkov <kirr at mns.spb.ru>
# Date 1201115032 -10800
# Node ID 92b7c6c80f1d6023cf8cad5d4dd3d440edf54bfb
# Parent 28a79c259fcfd52ac6a80696bff612a2dd0be829
mail: fix regression introduced in dc6ed2736c81
We erroneously use 'func.sendmail' instead of just 'func'
diff --git a/mercurial/mail.py b/mercurial/mail.py
--- a/mercurial/mail.py
+++ b/mercurial/mail.py
@@ -56,13 +56,13 @@ def connect(ui):
'''make a mail connection. return a function to send mail.
call as sendmail(sender, list-of-recipients, msg).'''
- func = _sendmail
+ func = lambda s,r,msg: _sendmail(ui,s,r,msg)
if ui.config('email', 'method', 'smtp') == 'smtp':
func = _smtp(ui)
def send(ui, sender, recipients, msg):
try:
- return func.sendmail(sender, recipients, msg)
+ return func(sender, recipients, msg)
except smtplib.SMTPRecipientsRefused, inst:
recipients = [r[1] for r in inst.recipients.values()]
raise util.Abort('\n' + '\n'.join(recipients))
More information about the Mercurial-devel
mailing list