mercurial-scm/hg-stable: mercurial/mail.py annotate

annotate mercurial/mail.py @ 18885:cf1304fbc184

smtp: add the class to verify the certificate of the SMTP server for STARTTLS Original "smtplib.SMTP" has no route to pass "ca_certs" and "cert_reqs" arguments to underlying SSL socket creation. This causes that "getpeercert()" on SSL socket returns empty dict, so the peer certificate for STARTTLS can't be verified. This patch introduces the "STARTTLS" class derived from "smtplib.SMTP" to pass "ca_certs" and "cert_reqs" arguments to underlying SSL socket creation. Almost all code of "starttls()" in this class is imported from "smtplib.SMTP" of Python 2.7.3, but it differs from original code in points below: - "self.ehlo_or_helo_if_needed()" invocation is omitted, because: - "ehlo_or_helo_if_needed()" is available with Python 2.6 or later, and - "ehlo()" is explicitly invoked in "mercurial.mail._smtp()" - "if not _have_ssl:" check is omitted, because: - "_have_ssl" is available with Python 2.6 or later, and - same checking is done in "mercurial.sslutil.ssl_wrap_socket()" - "ssl.wrap_socket()" is replaced by "sslutil.ssl_wrap_socket()" for compatibility between Python versions - use "sock.recv()" also as "sock.read()", if "sock" doesn't have "read()" method with Python 2.5.x or earlier, "sslutil.ssl_wrap_socket()" returns "httplib.FakeSocket"-ed object, and it doesn't have "read()" method, which is invoked via "smtplib.SSLFakeFile".

author	FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date	Tue, 26 Mar 2013 02:27:23 +0900
parents	72803c8edaa4
children	14a60a0f7122

rev	line source
2889 20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	1 # mail.py - mail sending bits for mercurial
20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	2 #
20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	3 # Copyright 2006 Matt Mackall <mpm@selenic.com>
20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	4 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 7948 diff changeset	5 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 9715 diff changeset	6 # GNU General Public License version 2 or any later version.
2889 20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	7
3891 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3877 diff changeset	8 from i18n import _
18885 cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	9 import util, encoding, sslutil
15560 cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 14965 diff changeset	10 import os, smtplib, socket, quopri, time
7114 30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	11 import email.Header, email.MIMEText, email.Utils
2889 20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	12
11542 594b98846ce1 mail: ensure that Python2.4 to 2.7 use the same header format Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10264 diff changeset	13 _oldheaderinit = email.Header.Header.__init__
594b98846ce1 mail: ensure that Python2.4 to 2.7 use the same header format Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10264 diff changeset	14 def _unifiedheaderinit(self, args, *kw):
594b98846ce1 mail: ensure that Python2.4 to 2.7 use the same header format Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10264 diff changeset	15 """
17428 72803c8edaa4 avoid using abbreviations that look like spelling errors Mads Kiilerich <mads@kiilerich.com> parents: 17424 diff changeset	16 Python 2.7 introduces a backwards incompatible change
11542 594b98846ce1 mail: ensure that Python2.4 to 2.7 use the same header format Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10264 diff changeset	17 (Python issue1974, r70772) in email.Generator.Generator code:
594b98846ce1 mail: ensure that Python2.4 to 2.7 use the same header format Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10264 diff changeset	18 pre-2.7 code passed "continuation_ws='\t'" to the Header
594b98846ce1 mail: ensure that Python2.4 to 2.7 use the same header format Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10264 diff changeset	19 constructor, and 2.7 removed this parameter.
594b98846ce1 mail: ensure that Python2.4 to 2.7 use the same header format Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10264 diff changeset	20
594b98846ce1 mail: ensure that Python2.4 to 2.7 use the same header format Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10264 diff changeset	21 Default argument is continuation_ws=' ', which means that the
594b98846ce1 mail: ensure that Python2.4 to 2.7 use the same header format Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10264 diff changeset	22 behaviour is different in <2.7 and 2.7
594b98846ce1 mail: ensure that Python2.4 to 2.7 use the same header format Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10264 diff changeset	23
594b98846ce1 mail: ensure that Python2.4 to 2.7 use the same header format Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10264 diff changeset	24 We consider the 2.7 behaviour to be preferable, but need
594b98846ce1 mail: ensure that Python2.4 to 2.7 use the same header format Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10264 diff changeset	25 to have an unified behaviour for versions 2.4 to 2.7
594b98846ce1 mail: ensure that Python2.4 to 2.7 use the same header format Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10264 diff changeset	26 """
594b98846ce1 mail: ensure that Python2.4 to 2.7 use the same header format Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10264 diff changeset	27 # override continuation_ws
594b98846ce1 mail: ensure that Python2.4 to 2.7 use the same header format Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10264 diff changeset	28 kw['continuation_ws'] = ' '
594b98846ce1 mail: ensure that Python2.4 to 2.7 use the same header format Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10264 diff changeset	29 _oldheaderinit(self, args, *kw)
594b98846ce1 mail: ensure that Python2.4 to 2.7 use the same header format Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10264 diff changeset	30
594b98846ce1 mail: ensure that Python2.4 to 2.7 use the same header format Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10264 diff changeset	31 email.Header.Header.__dict__['__init__'] = _unifiedheaderinit
594b98846ce1 mail: ensure that Python2.4 to 2.7 use the same header format Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10264 diff changeset	32
18885 cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	33 class STARTTLS(smtplib.SMTP):
cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	34 '''Derived class to verify the peer certificate for STARTTLS.
cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	35
cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	36 This class allows to pass any keyword arguments to SSL socket creation.
cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	37 '''
cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	38 def __init__(self, sslkwargs, **kwargs):
cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	39 smtplib.SMTP.__init__(self, **kwargs)
cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	40 self._sslkwargs = sslkwargs
cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	41
cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	42 def starttls(self, keyfile=None, certfile=None):
cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	43 if not self.has_extn("starttls"):
cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	44 msg = "STARTTLS extension not supported by server"
cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	45 raise smtplib.SMTPException(msg)
cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	46 (resp, reply) = self.docmd("STARTTLS")
cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	47 if resp == 220:
cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	48 self.sock = sslutil.ssl_wrap_socket(self.sock, keyfile, certfile,
cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	49 **self._sslkwargs)
cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	50 if not util.safehasattr(self.sock, "read"):
cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	51 # using httplib.FakeSocket with Python 2.5.x or earlier
cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	52 self.sock.read = self.sock.recv
cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	53 self.file = smtplib.SSLFakeFile(self.sock)
cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	54 self.helo_resp = None
cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	55 self.ehlo_resp = None
cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	56 self.esmtp_features = {}
cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	57 self.does_esmtp = 0
cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	58 return (resp, reply)
cf1304fbc184 smtp: add the class to verify the certificate of the SMTP server for STARTTLS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17428 diff changeset	59
2889 20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	60 def _smtp(ui):
5973 ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	61 '''build an smtp connection and return a function to send mail'''
2889 20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	62 local_hostname = ui.config('smtp', 'local_hostname')
13244 d8f92c3a17d6 mail: fix regression when parsing unset smtp.tls option Patrick Mezard <pmezard@gmail.com> parents: 13201 diff changeset	63 tls = ui.config('smtp', 'tls', 'none')
13201 f05250572467 smtp: fix for server doesn't support starttls extension Zhigang Wang <zhigang.x.wang@oracle.com> parents: 12091 diff changeset	64 # backward compatible: when tls = true, we use starttls.
f05250572467 smtp: fix for server doesn't support starttls extension Zhigang Wang <zhigang.x.wang@oracle.com> parents: 12091 diff changeset	65 starttls = tls == 'starttls' or util.parsebool(tls)
f05250572467 smtp: fix for server doesn't support starttls extension Zhigang Wang <zhigang.x.wang@oracle.com> parents: 12091 diff changeset	66 smtps = tls == 'smtps'
14965 194b043dfa51 mail: use safehasattr instead of hasattr Augie Fackler <durin42@gmail.com> parents: 14271 diff changeset	67 if (starttls or smtps) and not util.safehasattr(socket, 'ssl'):
13201 f05250572467 smtp: fix for server doesn't support starttls extension Zhigang Wang <zhigang.x.wang@oracle.com> parents: 12091 diff changeset	68 raise util.Abort(_("can't use TLS: Python SSL support not installed"))
f05250572467 smtp: fix for server doesn't support starttls extension Zhigang Wang <zhigang.x.wang@oracle.com> parents: 12091 diff changeset	69 if smtps:
f05250572467 smtp: fix for server doesn't support starttls extension Zhigang Wang <zhigang.x.wang@oracle.com> parents: 12091 diff changeset	70 ui.note(_('(using smtps)\n'))
f05250572467 smtp: fix for server doesn't support starttls extension Zhigang Wang <zhigang.x.wang@oracle.com> parents: 12091 diff changeset	71 s = smtplib.SMTP_SSL(local_hostname=local_hostname)
f05250572467 smtp: fix for server doesn't support starttls extension Zhigang Wang <zhigang.x.wang@oracle.com> parents: 12091 diff changeset	72 else:
f05250572467 smtp: fix for server doesn't support starttls extension Zhigang Wang <zhigang.x.wang@oracle.com> parents: 12091 diff changeset	73 s = smtplib.SMTP(local_hostname=local_hostname)
2889 20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	74 mailhost = ui.config('smtp', 'host')
20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	75 if not mailhost:
12090 ee601a6264e0 mail: use standard section.entry format in error message Martin Geisler <mg@lazybytes.net> parents: 11542 diff changeset	76 raise util.Abort(_('smtp.host not configured - cannot send mail'))
12076 49463314c24f mail/hgweb: support service names for ports (issue2350) Brodie Rao <brodie@bitheap.org> parents: 11542 diff changeset	77 mailport = util.getport(ui.config('smtp', 'port', 25))
2964 26c8d37496c2 fix typo in mail.py Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2929 diff changeset	78 ui.note(_('sending mail: smtp host %s, port %s\n') %
26c8d37496c2 fix typo in mail.py Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2929 diff changeset	79 (mailhost, mailport))
2889 20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	80 s.connect(host=mailhost, port=mailport)
13201 f05250572467 smtp: fix for server doesn't support starttls extension Zhigang Wang <zhigang.x.wang@oracle.com> parents: 12091 diff changeset	81 if starttls:
f05250572467 smtp: fix for server doesn't support starttls extension Zhigang Wang <zhigang.x.wang@oracle.com> parents: 12091 diff changeset	82 ui.note(_('(using starttls)\n'))
2889 20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	83 s.ehlo()
20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	84 s.starttls()
20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	85 s.ehlo()
20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	86 username = ui.config('smtp', 'username')
20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	87 password = ui.config('smtp', 'password')
5749 4fba4fee0718 Patchbomb: Prompt password when using SMTP/TLS and no password in .hgrc. Arun Thomas <arun.thomas@gmail.com> parents: 5472 diff changeset	88 if username and not password:
4fba4fee0718 Patchbomb: Prompt password when using SMTP/TLS and no password in .hgrc. Arun Thomas <arun.thomas@gmail.com> parents: 5472 diff changeset	89 password = ui.getpass()
2889 20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	90 if username and password:
20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	91 ui.note(_('(authenticating to mail server as %s)\n') %
20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	92 (username))
9246 2de7d96593db email: Catch exceptions during send. David Soria Parra <dsp@php.net> parents: 8343 diff changeset	93 try:
2de7d96593db email: Catch exceptions during send. David Soria Parra <dsp@php.net> parents: 8343 diff changeset	94 s.login(username, password)
2de7d96593db email: Catch exceptions during send. David Soria Parra <dsp@php.net> parents: 8343 diff changeset	95 except smtplib.SMTPException, inst:
2de7d96593db email: Catch exceptions during send. David Soria Parra <dsp@php.net> parents: 8343 diff changeset	96 raise util.Abort(inst)
2889 20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	97
5973 ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	98 def send(sender, recipients, msg):
ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	99 try:
ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	100 return s.sendmail(sender, recipients, msg)
ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	101 except smtplib.SMTPRecipientsRefused, inst:
ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	102 recipients = [r[1] for r in inst.recipients.values()]
ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	103 raise util.Abort('\n' + '\n'.join(recipients))
ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	104 except smtplib.SMTPException, inst:
ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	105 raise util.Abort(inst)
5947 528c986f0162 Backed out changeset dc6ed2736c81 Bryan O'Sullivan <bos@serpentine.com> parents: 5866 diff changeset	106
5973 ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	107 return send
5947 528c986f0162 Backed out changeset dc6ed2736c81 Bryan O'Sullivan <bos@serpentine.com> parents: 5866 diff changeset	108
5973 ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	109 def _sendmail(ui, sender, recipients, msg):
ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	110 '''send mail using sendmail.'''
ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	111 program = ui.config('email', 'method')
5975 75d9fe70c654 templater: move email function to util Matt Mackall <mpm@selenic.com> parents: 5973 diff changeset	112 cmdline = '%s -f %s %s' % (program, util.email(sender),
75d9fe70c654 templater: move email function to util Matt Mackall <mpm@selenic.com> parents: 5973 diff changeset	113 ' '.join(map(util.email, recipients)))
5973 ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	114 ui.note(_('sending mail: %s\n') % cmdline)
6548 962eb403165b replace usage of os.popen() with util.popen() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5975 diff changeset	115 fp = util.popen(cmdline, 'w')
5973 ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	116 fp.write(msg)
ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	117 ret = fp.close()
ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	118 if ret:
ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	119 raise util.Abort('%s %s' % (
ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	120 os.path.basename(program.split(None, 1)[0]),
14234 600e64004eb5 rename explain_exit to explainexit Adrian Buehlmann <adrian@cadifra.com> parents: 13244 diff changeset	121 util.explainexit(ret)[0]))
2889 20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	122
15560 cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 14965 diff changeset	123 def _mbox(mbox, sender, recipients, msg):
cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 14965 diff changeset	124 '''write mails to mbox'''
cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 14965 diff changeset	125 fp = open(mbox, 'ab+')
cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 14965 diff changeset	126 # Should be time.asctime(), but Windows prints 2-characters day
cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 14965 diff changeset	127 # of month instead of one. Make them print the same thing.
cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 14965 diff changeset	128 date = time.strftime('%a %b %d %H:%M:%S %Y', time.localtime())
cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 14965 diff changeset	129 fp.write('From %s %s\n' % (sender, date))
cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 14965 diff changeset	130 fp.write(msg)
cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 14965 diff changeset	131 fp.write('\n\n')
cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 14965 diff changeset	132 fp.close()
cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 14965 diff changeset	133
cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 14965 diff changeset	134 def connect(ui, mbox=None):
5973 ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	135 '''make a mail connection. return a function to send mail.
2889 20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	136 call as sendmail(sender, list-of-recipients, msg).'''
15560 cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 14965 diff changeset	137 if mbox:
cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 14965 diff changeset	138 open(mbox, 'wb').close()
cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 14965 diff changeset	139 return lambda s, r, m: _mbox(mbox, s, r, m)
5973 ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	140 if ui.config('email', 'method', 'smtp') == 'smtp':
5947 528c986f0162 Backed out changeset dc6ed2736c81 Bryan O'Sullivan <bos@serpentine.com> parents: 5866 diff changeset	141 return _smtp(ui)
5973 ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	142 return lambda s, r, m: _sendmail(ui, s, r, m)
2889 20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	143
15561 ca572e94d8e7 notify: add option for writing to mbox Mads Kiilerich <mads@kiilerich.com> parents: 15560 diff changeset	144 def sendmail(ui, sender, recipients, msg, mbox=None):
ca572e94d8e7 notify: add option for writing to mbox Mads Kiilerich <mads@kiilerich.com> parents: 15560 diff changeset	145 send = connect(ui, mbox=mbox)
5973 ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	146 return send(sender, recipients, msg)
4489 a11e13d50645 patchbomb: Validate email config before we start prompting for info. Bryan O'Sullivan <bos@serpentine.com> parents: 4096 diff changeset	147
a11e13d50645 patchbomb: Validate email config before we start prompting for info. Bryan O'Sullivan <bos@serpentine.com> parents: 4096 diff changeset	148 def validateconfig(ui):
a11e13d50645 patchbomb: Validate email config before we start prompting for info. Bryan O'Sullivan <bos@serpentine.com> parents: 4096 diff changeset	149 '''determine if we have enough config data to try sending email.'''
a11e13d50645 patchbomb: Validate email config before we start prompting for info. Bryan O'Sullivan <bos@serpentine.com> parents: 4096 diff changeset	150 method = ui.config('email', 'method', 'smtp')
a11e13d50645 patchbomb: Validate email config before we start prompting for info. Bryan O'Sullivan <bos@serpentine.com> parents: 4096 diff changeset	151 if method == 'smtp':
a11e13d50645 patchbomb: Validate email config before we start prompting for info. Bryan O'Sullivan <bos@serpentine.com> parents: 4096 diff changeset	152 if not ui.config('smtp', 'host'):
a11e13d50645 patchbomb: Validate email config before we start prompting for info. Bryan O'Sullivan <bos@serpentine.com> parents: 4096 diff changeset	153 raise util.Abort(_('smtp specified as email transport, '
a11e13d50645 patchbomb: Validate email config before we start prompting for info. Bryan O'Sullivan <bos@serpentine.com> parents: 4096 diff changeset	154 'but no smtp host configured'))
a11e13d50645 patchbomb: Validate email config before we start prompting for info. Bryan O'Sullivan <bos@serpentine.com> parents: 4096 diff changeset	155 else:
14271 4030630fb59c rename util.find_exe to findexe Adrian Buehlmann <adrian@cadifra.com> parents: 14234 diff changeset	156 if not util.findexe(method):
4489 a11e13d50645 patchbomb: Validate email config before we start prompting for info. Bryan O'Sullivan <bos@serpentine.com> parents: 4096 diff changeset	157 raise util.Abort(_('%r specified as email transport, '
a11e13d50645 patchbomb: Validate email config before we start prompting for info. Bryan O'Sullivan <bos@serpentine.com> parents: 4096 diff changeset	158 'but not in PATH') % method)
7114 30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	159
7191 d14212218582 mail: mime-encode patches that are utf-8 Christian Ebert <blacktrash@gmx.net> parents: 7114 diff changeset	160 def mimetextpatch(s, subtype='plain', display=False):
15562 a82b6038ff08 mail: use quoted-printable for mime encoding to avoid too long lines (issue3075) Mads Kiilerich <mads@kiilerich.com> parents: 15561 diff changeset	161 '''Return MIME message suitable for a patch.
a82b6038ff08 mail: use quoted-printable for mime encoding to avoid too long lines (issue3075) Mads Kiilerich <mads@kiilerich.com> parents: 15561 diff changeset	162 Charset will be detected as utf-8 or (possibly fake) us-ascii.
a82b6038ff08 mail: use quoted-printable for mime encoding to avoid too long lines (issue3075) Mads Kiilerich <mads@kiilerich.com> parents: 15561 diff changeset	163 Transfer encodings will be used if necessary.'''
8332 3e544c074459 patchbomb: quoted-printable encode overly long lines Rocco Rutte <pdmef@gmx.net> parents: 8312 diff changeset	164
3e544c074459 patchbomb: quoted-printable encode overly long lines Rocco Rutte <pdmef@gmx.net> parents: 8312 diff changeset	165 cs = 'us-ascii'
7191 d14212218582 mail: mime-encode patches that are utf-8 Christian Ebert <blacktrash@gmx.net> parents: 7114 diff changeset	166 if not display:
8332 3e544c074459 patchbomb: quoted-printable encode overly long lines Rocco Rutte <pdmef@gmx.net> parents: 8312 diff changeset	167 try:
3e544c074459 patchbomb: quoted-printable encode overly long lines Rocco Rutte <pdmef@gmx.net> parents: 8312 diff changeset	168 s.decode('us-ascii')
3e544c074459 patchbomb: quoted-printable encode overly long lines Rocco Rutte <pdmef@gmx.net> parents: 8312 diff changeset	169 except UnicodeDecodeError:
7191 d14212218582 mail: mime-encode patches that are utf-8 Christian Ebert <blacktrash@gmx.net> parents: 7114 diff changeset	170 try:
8332 3e544c074459 patchbomb: quoted-printable encode overly long lines Rocco Rutte <pdmef@gmx.net> parents: 8312 diff changeset	171 s.decode('utf-8')
3e544c074459 patchbomb: quoted-printable encode overly long lines Rocco Rutte <pdmef@gmx.net> parents: 8312 diff changeset	172 cs = 'utf-8'
7191 d14212218582 mail: mime-encode patches that are utf-8 Christian Ebert <blacktrash@gmx.net> parents: 7114 diff changeset	173 except UnicodeDecodeError:
8332 3e544c074459 patchbomb: quoted-printable encode overly long lines Rocco Rutte <pdmef@gmx.net> parents: 8312 diff changeset	174 # We'll go with us-ascii as a fallback.
7191 d14212218582 mail: mime-encode patches that are utf-8 Christian Ebert <blacktrash@gmx.net> parents: 7114 diff changeset	175 pass
8332 3e544c074459 patchbomb: quoted-printable encode overly long lines Rocco Rutte <pdmef@gmx.net> parents: 8312 diff changeset	176
15562 a82b6038ff08 mail: use quoted-printable for mime encoding to avoid too long lines (issue3075) Mads Kiilerich <mads@kiilerich.com> parents: 15561 diff changeset	177 return mimetextqp(s, subtype, cs)
a82b6038ff08 mail: use quoted-printable for mime encoding to avoid too long lines (issue3075) Mads Kiilerich <mads@kiilerich.com> parents: 15561 diff changeset	178
a82b6038ff08 mail: use quoted-printable for mime encoding to avoid too long lines (issue3075) Mads Kiilerich <mads@kiilerich.com> parents: 15561 diff changeset	179 def mimetextqp(body, subtype, charset):
a82b6038ff08 mail: use quoted-printable for mime encoding to avoid too long lines (issue3075) Mads Kiilerich <mads@kiilerich.com> parents: 15561 diff changeset	180 '''Return MIME message.
17424 e7cfe3587ea4 fix trivial spelling errors Mads Kiilerich <mads@kiilerich.com> parents: 15562 diff changeset	181 Quoted-printable transfer encoding will be used if necessary.
15562 a82b6038ff08 mail: use quoted-printable for mime encoding to avoid too long lines (issue3075) Mads Kiilerich <mads@kiilerich.com> parents: 15561 diff changeset	182 '''
a82b6038ff08 mail: use quoted-printable for mime encoding to avoid too long lines (issue3075) Mads Kiilerich <mads@kiilerich.com> parents: 15561 diff changeset	183 enc = None
a82b6038ff08 mail: use quoted-printable for mime encoding to avoid too long lines (issue3075) Mads Kiilerich <mads@kiilerich.com> parents: 15561 diff changeset	184 for line in body.splitlines():
a82b6038ff08 mail: use quoted-printable for mime encoding to avoid too long lines (issue3075) Mads Kiilerich <mads@kiilerich.com> parents: 15561 diff changeset	185 if len(line) > 950:
a82b6038ff08 mail: use quoted-printable for mime encoding to avoid too long lines (issue3075) Mads Kiilerich <mads@kiilerich.com> parents: 15561 diff changeset	186 body = quopri.encodestring(body)
a82b6038ff08 mail: use quoted-printable for mime encoding to avoid too long lines (issue3075) Mads Kiilerich <mads@kiilerich.com> parents: 15561 diff changeset	187 enc = "quoted-printable"
a82b6038ff08 mail: use quoted-printable for mime encoding to avoid too long lines (issue3075) Mads Kiilerich <mads@kiilerich.com> parents: 15561 diff changeset	188 break
a82b6038ff08 mail: use quoted-printable for mime encoding to avoid too long lines (issue3075) Mads Kiilerich <mads@kiilerich.com> parents: 15561 diff changeset	189
a82b6038ff08 mail: use quoted-printable for mime encoding to avoid too long lines (issue3075) Mads Kiilerich <mads@kiilerich.com> parents: 15561 diff changeset	190 msg = email.MIMEText.MIMEText(body, subtype, charset)
8332 3e544c074459 patchbomb: quoted-printable encode overly long lines Rocco Rutte <pdmef@gmx.net> parents: 8312 diff changeset	191 if enc:
3e544c074459 patchbomb: quoted-printable encode overly long lines Rocco Rutte <pdmef@gmx.net> parents: 8312 diff changeset	192 del msg['Content-Transfer-Encoding']
3e544c074459 patchbomb: quoted-printable encode overly long lines Rocco Rutte <pdmef@gmx.net> parents: 8312 diff changeset	193 msg['Content-Transfer-Encoding'] = enc
3e544c074459 patchbomb: quoted-printable encode overly long lines Rocco Rutte <pdmef@gmx.net> parents: 8312 diff changeset	194 return msg
7191 d14212218582 mail: mime-encode patches that are utf-8 Christian Ebert <blacktrash@gmx.net> parents: 7114 diff changeset	195
7114 30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	196 def _charsets(ui):
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	197 '''Obtains charsets to send mail parts not containing patches.'''
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	198 charsets = [cs.lower() for cs in ui.configlist('email', 'charsets')]
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7195 diff changeset	199 fallbacks = [encoding.fallbackencoding.lower(),
de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7195 diff changeset	200 encoding.encoding.lower(), 'utf-8']
8343 6fbbb90261b1 mail: updated comment Martin Geisler <mg@lazybytes.net> parents: 8332 diff changeset	201 for cs in fallbacks: # find unique charsets while keeping order
7114 30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	202 if cs not in charsets:
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	203 charsets.append(cs)
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	204 return [cs for cs in charsets if not cs.endswith('ascii')]
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	205
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	206 def _encode(ui, s, charsets):
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	207 '''Returns (converted) string, charset tuple.
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	208 Finds out best charset by cycling through sendcharsets in descending
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7195 diff changeset	209 order. Tries both encoding and fallbackencoding for input. Only as
7114 30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	210 last resort send as is in fake ascii.
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	211 Caveat: Do not use for mail parts containing patches!'''
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	212 try:
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	213 s.decode('ascii')
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	214 except UnicodeDecodeError:
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	215 sendcharsets = charsets or _charsets(ui)
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7195 diff changeset	216 for ics in (encoding.encoding, encoding.fallbackencoding):
7114 30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	217 try:
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	218 u = s.decode(ics)
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	219 except UnicodeDecodeError:
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	220 continue
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	221 for ocs in sendcharsets:
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	222 try:
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	223 return u.encode(ocs), ocs
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	224 except UnicodeEncodeError:
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	225 pass
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	226 except LookupError:
7195 9fabcb1fe68d mail: correct typo in variable name Christian Ebert <blacktrash@gmx.net> parents: 7191 diff changeset	227 ui.warn(_('ignoring invalid sendcharset: %s\n') % ocs)
7114 30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	228 # if ascii, or all conversion attempts fail, send (broken) ascii
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	229 return s, 'us-ascii'
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	230
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	231 def headencode(ui, s, charsets=None, display=False):
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	232 '''Returns RFC-2047 compliant header from given string.'''
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	233 if not display:
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	234 # split into words?
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	235 s, cs = _encode(ui, s, charsets)
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	236 return str(email.Header.Header(s, cs))
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	237 return s
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	238
9948 e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	239 def _addressencode(ui, name, addr, charsets=None):
7114 30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	240 name = headencode(ui, name, charsets)
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	241 try:
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	242 acc, dom = addr.split('@')
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	243 acc = acc.encode('ascii')
9715 f0e99a2eac76 patchbomb: fix handling of email addresses with Unicode domains (IDNA) Marti Raudsepp <marti@juffo.org> parents: 9246 diff changeset	244 dom = dom.decode(encoding.encoding).encode('idna')
7114 30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	245 addr = '%s@%s' % (acc, dom)
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	246 except UnicodeDecodeError:
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	247 raise util.Abort(_('invalid email address: %s') % addr)
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	248 except ValueError:
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	249 try:
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	250 # too strict?
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	251 addr = addr.encode('ascii')
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	252 except UnicodeDecodeError:
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	253 raise util.Abort(_('invalid local address: %s') % addr)
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	254 return email.Utils.formataddr((name, addr))
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	255
9948 e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	256 def addressencode(ui, address, charsets=None, display=False):
e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	257 '''Turns address into RFC-2047 compliant header.'''
e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	258 if display or not address:
e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	259 return address or ''
e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	260 name, addr = email.Utils.parseaddr(address)
e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	261 return _addressencode(ui, name, addr, charsets)
e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	262
e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	263 def addrlistencode(ui, addrs, charsets=None, display=False):
e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	264 '''Turns a list of addresses into a list of RFC-2047 compliant headers.
e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	265 A single element of input list may contain multiple addresses, but output
e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	266 always has one address per item'''
e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	267 if display:
e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	268 return [a.strip() for a in addrs if a.strip()]
e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	269
e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	270 result = []
e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	271 for name, addr in email.Utils.getaddresses(addrs):
e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	272 if name or addr:
e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	273 result.append(_addressencode(ui, name, addr, charsets))
e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	274 return result
e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	275
7114 30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	276 def mimeencode(ui, s, charsets=None, display=False):
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	277 '''creates mime text object, encodes it if needed, and sets
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	278 charset and transfer-encoding accordingly.'''
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	279 cs = 'us-ascii'
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	280 if not display:
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	281 s, cs = _encode(ui, s, charsets)
15562 a82b6038ff08 mail: use quoted-printable for mime encoding to avoid too long lines (issue3075) Mads Kiilerich <mads@kiilerich.com> parents: 15561 diff changeset	282 return mimetextqp(s, 'plain', cs)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/mail.py @ 18885:cf1304fbc184