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

annotate mercurial/mail.py @ 43117:8ff1ecfadcd1

cleanup: join string literals that are already on one line Thanks to Kyle for noticing this and for providing the regular expression to run on the codebase. This patch has been reviewed by the test suite and they approved of it. # skip-blame: fallout from mass reformatting Differential Revision: https://phab.mercurial-scm.org/D7028

author	Martin von Zweigbergk <martinvonz@google.com>
date	Tue, 08 Oct 2019 15:06:18 -0700
parents	813aa8cc55d4
children	0e6a7ce81dde

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
30325 f6369544bf85 mail: do not print(), use ui.debug() instead Yuya Nishihara <yuya@tcha.org> parents: 30089 diff changeset	8 from __future__ import absolute_import
25957 ae21d51bdc43 mail: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25842 diff changeset	9
19790 53f16f4aff33 mail: correct import of email module Augie Fackler <raf@durin42.com> parents: 19050 diff changeset	10 import email
30089 040f23ed6963 mail: take --encoding and HGENCODING into account G?bor Stefanik <gabor.stefanik@nng.com> parents: 30072 diff changeset	11 import email.charset
30072 87b8e40eb812 mail: handle renamed email.Header Pulkit Goyal <7895pulkit@gmail.com> parents: 29285 diff changeset	12 import email.header
34310 2d0c306a88c2 mail: encode long unicode lines in emails properly (issue5687) Igor Ippolitov <iippolitov@gmail.com> parents: 33499 diff changeset	13 import email.message
38332 7b12a2d2eedc py3: ditch email.parser.BytesParser which appears to be plain crap Yuya Nishihara <yuya@tcha.org> parents: 37469 diff changeset	14 import email.parser
7b12a2d2eedc py3: ditch email.parser.BytesParser which appears to be plain crap Yuya Nishihara <yuya@tcha.org> parents: 37469 diff changeset	15 import io
25957 ae21d51bdc43 mail: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25842 diff changeset	16 import os
ae21d51bdc43 mail: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25842 diff changeset	17 import smtplib
ae21d51bdc43 mail: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25842 diff changeset	18 import socket
ae21d51bdc43 mail: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25842 diff changeset	19 import time
ae21d51bdc43 mail: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25842 diff changeset	20
ae21d51bdc43 mail: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25842 diff changeset	21 from .i18n import _
43089 c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43085 diff changeset	22 from .pycompat import (
c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43085 diff changeset	23 getattr,
c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43085 diff changeset	24 open,
c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43085 diff changeset	25 )
25957 ae21d51bdc43 mail: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25842 diff changeset	26 from . import (
ae21d51bdc43 mail: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25842 diff changeset	27 encoding,
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26098 diff changeset	28 error,
36047 1407c42b302c py3: pass system string to email.message.Message.set_type() Gregory Szorc <gregory.szorc@gmail.com> parents: 35151 diff changeset	29 pycompat,
25957 ae21d51bdc43 mail: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25842 diff changeset	30 sslutil,
ae21d51bdc43 mail: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25842 diff changeset	31 util,
ae21d51bdc43 mail: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25842 diff changeset	32 )
37084 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36120 diff changeset	33 from .utils import (
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37084 diff changeset	34 procutil,
37084 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36120 diff changeset	35 stringutil,
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36120 diff changeset	36 )
2889 20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	37
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	38
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	39 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	40 '''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	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 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	43 '''
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	44
29251 31acc78c632a mail: remove use of sslkwargs Gregory Szorc <gregory.szorc@gmail.com> parents: 29248 diff changeset	45 def __init__(self, ui, host=None, **kwargs):
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	46 smtplib.SMTP.__init__(self, **kwargs)
29248 e6de6ef3e426 sslutil: remove ui from sslkwargs (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 29227 diff changeset	47 self._ui = ui
28935 a4c5c23de1d3 mail: retain hostname for sslutil.wrapsocket (issue5203) timeless <timeless@mozdev.org> parents: 28341 diff changeset	48 self._host = host
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	49
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 def starttls(self, keyfile=None, certfile=None):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	51 if not self.has_extn(b"starttls"):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	52 msg = b"STARTTLS extension not supported by server"
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	53 raise smtplib.SMTPException(msg)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	54 (resp, reply) = self.docmd(b"STARTTLS")
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	55 if resp == 220:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	56 self.sock = sslutil.wrapsocket(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	57 self.sock,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	58 keyfile,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	59 certfile,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	60 ui=self._ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	61 serverhostname=self._host,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	62 )
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	63 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	64 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	65 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	66 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	67 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	68 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	69
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	70
26673 ab1af5e7d734 mail: drop python 2.5 support timeless@mozdev.org parents: 26587 diff changeset	71 class SMTPS(smtplib.SMTP):
ab1af5e7d734 mail: drop python 2.5 support timeless@mozdev.org parents: 26587 diff changeset	72 '''Derived class to verify the peer certificate for SMTPS.
18886 14a60a0f7122 smtp: add the class to verify the certificate of the SMTP server for SMTPS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18885 diff changeset	73
26673 ab1af5e7d734 mail: drop python 2.5 support timeless@mozdev.org parents: 26587 diff changeset	74 This class allows to pass any keyword arguments to SSL socket creation.
ab1af5e7d734 mail: drop python 2.5 support timeless@mozdev.org parents: 26587 diff changeset	75 '''
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	76
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	77 def __init__(self, ui, keyfile=None, certfile=None, host=None, **kwargs):
26673 ab1af5e7d734 mail: drop python 2.5 support timeless@mozdev.org parents: 26587 diff changeset	78 self.keyfile = keyfile
ab1af5e7d734 mail: drop python 2.5 support timeless@mozdev.org parents: 26587 diff changeset	79 self.certfile = certfile
ab1af5e7d734 mail: drop python 2.5 support timeless@mozdev.org parents: 26587 diff changeset	80 smtplib.SMTP.__init__(self, **kwargs)
28935 a4c5c23de1d3 mail: retain hostname for sslutil.wrapsocket (issue5203) timeless <timeless@mozdev.org> parents: 28341 diff changeset	81 self._host = host
26673 ab1af5e7d734 mail: drop python 2.5 support timeless@mozdev.org parents: 26587 diff changeset	82 self.default_port = smtplib.SMTP_SSL_PORT
29248 e6de6ef3e426 sslutil: remove ui from sslkwargs (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 29227 diff changeset	83 self._ui = ui
26673 ab1af5e7d734 mail: drop python 2.5 support timeless@mozdev.org parents: 26587 diff changeset	84
ab1af5e7d734 mail: drop python 2.5 support timeless@mozdev.org parents: 26587 diff changeset	85 def _get_socket(self, host, port, timeout):
ab1af5e7d734 mail: drop python 2.5 support timeless@mozdev.org parents: 26587 diff changeset	86 if self.debuglevel > 0:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	87 self._ui.debug(b'connect: %r\n' % ((host, port),))
26673 ab1af5e7d734 mail: drop python 2.5 support timeless@mozdev.org parents: 26587 diff changeset	88 new_socket = socket.create_connection((host, port), timeout)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	89 new_socket = sslutil.wrapsocket(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	90 new_socket,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	91 self.keyfile,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	92 self.certfile,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	93 ui=self._ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	94 serverhostname=self._host,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	95 )
39026 a5e70c14214a mail: stop using the smtplib.SSLFakeFile and use socket.socket.makefile Augie Fackler <augie@google.com> parents: 39025 diff changeset	96 self.file = new_socket.makefile(r'rb')
26673 ab1af5e7d734 mail: drop python 2.5 support timeless@mozdev.org parents: 26587 diff changeset	97 return new_socket
18886 14a60a0f7122 smtp: add the class to verify the certificate of the SMTP server for SMTPS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18885 diff changeset	98
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	99
39025 569d662816de mail: modernize check for Python-with-TLS Augie Fackler <augie@google.com> parents: 39024 diff changeset	100 def _pyhastls():
569d662816de mail: modernize check for Python-with-TLS Augie Fackler <augie@google.com> parents: 39024 diff changeset	101 """Returns true iff Python has TLS support, false otherwise."""
569d662816de mail: modernize check for Python-with-TLS Augie Fackler <augie@google.com> parents: 39024 diff changeset	102 try:
569d662816de mail: modernize check for Python-with-TLS Augie Fackler <augie@google.com> parents: 39024 diff changeset	103 import ssl
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	104
39025 569d662816de mail: modernize check for Python-with-TLS Augie Fackler <augie@google.com> parents: 39024 diff changeset	105 getattr(ssl, 'HAS_TLS', False)
569d662816de mail: modernize check for Python-with-TLS Augie Fackler <augie@google.com> parents: 39024 diff changeset	106 return True
569d662816de mail: modernize check for Python-with-TLS Augie Fackler <augie@google.com> parents: 39024 diff changeset	107 except ImportError:
569d662816de mail: modernize check for Python-with-TLS Augie Fackler <augie@google.com> parents: 39024 diff changeset	108 return False
569d662816de mail: modernize check for Python-with-TLS Augie Fackler <augie@google.com> parents: 39024 diff changeset	109
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	110
2889 20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	111 def _smtp(ui):
5973 ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	112 '''build an smtp connection and return a function to send mail'''
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	113 local_hostname = ui.config(b'smtp', b'local_hostname')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	114 tls = ui.config(b'smtp', b'tls')
13201 f05250572467 smtp: fix for server doesn't support starttls extension Zhigang Wang <zhigang.x.wang@oracle.com> parents: 12091 diff changeset	115 # backward compatible: when tls = true, we use starttls.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	116 starttls = tls == b'starttls' or stringutil.parsebool(tls)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	117 smtps = tls == b'smtps'
39025 569d662816de mail: modernize check for Python-with-TLS Augie Fackler <augie@google.com> parents: 39024 diff changeset	118 if (starttls or smtps) and not _pyhastls():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	119 raise error.Abort(_(b"can't use TLS: Python SSL support not installed"))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	120 mailhost = ui.config(b'smtp', b'host')
2889 20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	121 if not mailhost:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	122 raise error.Abort(_(b'smtp.host not configured - cannot send mail'))
18888 19d489404d79 smtp: verify the certificate of the SMTP server for STARTTLS/SMTPS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18886 diff changeset	123 if smtps:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	124 ui.note(_(b'(using smtps)\n'))
29251 31acc78c632a mail: remove use of sslkwargs Gregory Szorc <gregory.szorc@gmail.com> parents: 29248 diff changeset	125 s = SMTPS(ui, local_hostname=local_hostname, host=mailhost)
18888 19d489404d79 smtp: verify the certificate of the SMTP server for STARTTLS/SMTPS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18886 diff changeset	126 elif starttls:
29251 31acc78c632a mail: remove use of sslkwargs Gregory Szorc <gregory.szorc@gmail.com> parents: 29248 diff changeset	127 s = STARTTLS(ui, local_hostname=local_hostname, host=mailhost)
18888 19d489404d79 smtp: verify the certificate of the SMTP server for STARTTLS/SMTPS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18886 diff changeset	128 else:
19d489404d79 smtp: verify the certificate of the SMTP server for STARTTLS/SMTPS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18886 diff changeset	129 s = smtplib.SMTP(local_hostname=local_hostname)
19050 601c1e226889 smtp: use 465 as default port for SMTPS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18916 diff changeset	130 if smtps:
601c1e226889 smtp: use 465 as default port for SMTPS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18916 diff changeset	131 defaultport = 465
601c1e226889 smtp: use 465 as default port for SMTPS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18916 diff changeset	132 else:
601c1e226889 smtp: use 465 as default port for SMTPS FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18916 diff changeset	133 defaultport = 25
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	134 mailport = util.getport(ui.config(b'smtp', b'port', defaultport))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	135 ui.note(_(b'sending mail: smtp host %s, port %d\n') % (mailhost, mailport))
2889 20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	136 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	137 if starttls:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	138 ui.note(_(b'(using starttls)\n'))
2889 20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	139 s.ehlo()
20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	140 s.starttls()
20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	141 s.ehlo()
29285 63a3749147af mail: unsupport smtp.verifycert (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 29251 diff changeset	142 if starttls or smtps:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	143 ui.note(_(b'(verifying remote certificate)\n'))
29285 63a3749147af mail: unsupport smtp.verifycert (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 29251 diff changeset	144 sslutil.validatesocket(s.sock)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	145 username = ui.config(b'smtp', b'username')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	146 password = ui.config(b'smtp', b'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	147 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	148 password = ui.getpass()
2889 20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	149 if username and password:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	150 ui.note(_(b'(authenticating to mail server as %s)\n') % username)
9246 2de7d96593db email: Catch exceptions during send. David Soria Parra <dsp@php.net> parents: 8343 diff changeset	151 try:
2de7d96593db email: Catch exceptions during send. David Soria Parra <dsp@php.net> parents: 8343 diff changeset	152 s.login(username, password)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25463 diff changeset	153 except smtplib.SMTPException as inst:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26098 diff changeset	154 raise error.Abort(inst)
2889 20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	155
5973 ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	156 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	157 try:
ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	158 return s.sendmail(sender, recipients, msg)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25463 diff changeset	159 except smtplib.SMTPRecipientsRefused as inst:
5973 ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	160 recipients = [r[1] for r in inst.recipients.values()]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	161 raise error.Abort(b'\n' + b'\n'.join(recipients))
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25463 diff changeset	162 except smtplib.SMTPException as inst:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26098 diff changeset	163 raise error.Abort(inst)
5947 528c986f0162 Backed out changeset dc6ed2736c81 Bryan O'Sullivan <bos@serpentine.com> parents: 5866 diff changeset	164
5973 ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	165 return send
5947 528c986f0162 Backed out changeset dc6ed2736c81 Bryan O'Sullivan <bos@serpentine.com> parents: 5866 diff changeset	166
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	167
5973 ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	168 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	169 '''send mail using sendmail.'''
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	170 program = ui.config(b'email', b'method')
43096 813aa8cc55d4 patchbomb: use procutil.shellquote() instead of shlex to escape email address Yuya Nishihara <yuya@tcha.org> parents: 43089 diff changeset	171
813aa8cc55d4 patchbomb: use procutil.shellquote() instead of shlex to escape email address Yuya Nishihara <yuya@tcha.org> parents: 43089 diff changeset	172 def stremail(x):
813aa8cc55d4 patchbomb: use procutil.shellquote() instead of shlex to escape email address Yuya Nishihara <yuya@tcha.org> parents: 43089 diff changeset	173 return procutil.shellquote(stringutil.email(encoding.strtolocal(x)))
813aa8cc55d4 patchbomb: use procutil.shellquote() instead of shlex to escape email address Yuya Nishihara <yuya@tcha.org> parents: 43089 diff changeset	174
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	175 cmdline = b'%s -f %s %s' % (
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	176 program,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	177 stremail(sender),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	178 b' '.join(map(stremail, recipients)),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	179 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	180 ui.note(_(b'sending mail: %s\n') % cmdline)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	181 fp = procutil.popen(cmdline, b'wb')
37458 00e4bd97b095 procutil: always popen() in binary mode Yuya Nishihara <yuya@tcha.org> parents: 37120 diff changeset	182 fp.write(util.tonativeeol(msg))
5973 ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	183 ret = fp.close()
ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	184 if ret:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	185 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	186 b'%s %s'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	187 % (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	188 os.path.basename(program.split(None, 1)[0]),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	189 procutil.explainexit(ret),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	190 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	191 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	192
2889 20b95aef3fe0 Move ui.sendmail to mail.connect/sendmail Matt Mackall <mpm@selenic.com> parents: diff changeset	193
15560 cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 14965 diff changeset	194 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	195 '''write mails to mbox'''
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	196 fp = open(mbox, b'ab+')
15560 cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 14965 diff changeset	197 # 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	198 # of month instead of one. Make them print the same thing.
35151 b45a9d121b53 py3: make sure the first argument of time.strftime() is str Pulkit Goyal <7895pulkit@gmail.com> parents: 34310 diff changeset	199 date = time.strftime(r'%a %b %d %H:%M:%S %Y', time.localtime())
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	200 fp.write(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	201 b'From %s %s\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	202 % (encoding.strtolocal(sender), encoding.strtolocal(date))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	203 )
15560 cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 14965 diff changeset	204 fp.write(msg)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	205 fp.write(b'\n\n')
15560 cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 14965 diff changeset	206 fp.close()
cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 14965 diff changeset	207
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	208
15560 cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 14965 diff changeset	209 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	210 '''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	211 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	212 if mbox:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	213 open(mbox, b'wb').close()
15560 cc58c228503e mail: mbox handling as a part of mail handling, refactored from patchbomb Mads Kiilerich <mads@kiilerich.com> parents: 14965 diff changeset	214 return lambda s, r, m: _mbox(mbox, s, r, m)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	215 if ui.config(b'email', b'method') == b'smtp':
5947 528c986f0162 Backed out changeset dc6ed2736c81 Bryan O'Sullivan <bos@serpentine.com> parents: 5866 diff changeset	216 return _smtp(ui)
5973 ea77f6f77514 patchbomb: undo backout and fix bugs in the earlier patch Matt Mackall <mpm@selenic.com> parents: 5947 diff changeset	217 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	218
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	219
15561 ca572e94d8e7 notify: add option for writing to mbox Mads Kiilerich <mads@kiilerich.com> parents: 15560 diff changeset	220 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	221 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	222 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	223
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	224
4489 a11e13d50645 patchbomb: Validate email config before we start prompting for info. Bryan O'Sullivan <bos@serpentine.com> parents: 4096 diff changeset	225 def validateconfig(ui):
a11e13d50645 patchbomb: Validate email config before we start prompting for info. Bryan O'Sullivan <bos@serpentine.com> parents: 4096 diff changeset	226 '''determine if we have enough config data to try sending email.'''
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	227 method = ui.config(b'email', b'method')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	228 if method == b'smtp':
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	229 if not ui.config(b'smtp', b'host'):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	230 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	231 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	232 b'smtp specified as email transport, '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	233 b'but no smtp host configured'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	234 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	235 )
4489 a11e13d50645 patchbomb: Validate email config before we start prompting for info. Bryan O'Sullivan <bos@serpentine.com> parents: 4096 diff changeset	236 else:
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37084 diff changeset	237 if not procutil.findexe(method):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	238 raise error.Abort(
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43096 diff changeset	239 _(b'%r specified as email transport, but not in PATH') % method
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	240 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	241
7114 30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	242
30089 040f23ed6963 mail: take --encoding and HGENCODING into account G?bor Stefanik <gabor.stefanik@nng.com> parents: 30072 diff changeset	243 def codec2iana(cs):
040f23ed6963 mail: take --encoding and HGENCODING into account G?bor Stefanik <gabor.stefanik@nng.com> parents: 30072 diff changeset	244 ''''''
36119 6ea7f1c10c81 py3: cast character set to bytes Gregory Szorc <gregory.szorc@gmail.com> parents: 36118 diff changeset	245 cs = pycompat.sysbytes(email.charset.Charset(cs).input_charset.lower())
30089 040f23ed6963 mail: take --encoding and HGENCODING into account G?bor Stefanik <gabor.stefanik@nng.com> parents: 30072 diff changeset	246
040f23ed6963 mail: take --encoding and HGENCODING into account G?bor Stefanik <gabor.stefanik@nng.com> parents: 30072 diff changeset	247 # "latin1" normalizes to "iso8859-1", standard calls for "iso-8859-1"
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	248 if cs.startswith(b"iso") and not cs.startswith(b"iso-"):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	249 return b"iso-" + cs[3:]
30089 040f23ed6963 mail: take --encoding and HGENCODING into account G?bor Stefanik <gabor.stefanik@nng.com> parents: 30072 diff changeset	250 return cs
040f23ed6963 mail: take --encoding and HGENCODING into account G?bor Stefanik <gabor.stefanik@nng.com> parents: 30072 diff changeset	251
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	252
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	253 def mimetextpatch(s, subtype=b'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	254 '''Return MIME message suitable for a patch.
30089 040f23ed6963 mail: take --encoding and HGENCODING into account G?bor Stefanik <gabor.stefanik@nng.com> parents: 30072 diff changeset	255 Charset will be detected by first trying to decode as us-ascii, then utf-8,
040f23ed6963 mail: take --encoding and HGENCODING into account G?bor Stefanik <gabor.stefanik@nng.com> parents: 30072 diff changeset	256 and finally the global encodings. If all those fail, fall back to
040f23ed6963 mail: take --encoding and HGENCODING into account G?bor Stefanik <gabor.stefanik@nng.com> parents: 30072 diff changeset	257 ISO-8859-1, an encoding with that allows all byte sequences.
15562 a82b6038ff08 mail: use quoted-printable for mime encoding to avoid too long lines (issue3075) Mads Kiilerich <mads@kiilerich.com> parents: 15561 diff changeset	258 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	259
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	260 cs = [b'us-ascii', b'utf-8', encoding.encoding, encoding.fallbackencoding]
30089 040f23ed6963 mail: take --encoding and HGENCODING into account G?bor Stefanik <gabor.stefanik@nng.com> parents: 30072 diff changeset	261 if display:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	262 cs = [b'us-ascii']
30089 040f23ed6963 mail: take --encoding and HGENCODING into account G?bor Stefanik <gabor.stefanik@nng.com> parents: 30072 diff changeset	263 for charset in cs:
8332 3e544c074459 patchbomb: quoted-printable encode overly long lines Rocco Rutte <pdmef@gmx.net> parents: 8312 diff changeset	264 try:
36118 9e47bfbeb723 py3: cast decode() argument to system string Gregory Szorc <gregory.szorc@gmail.com> parents: 36047 diff changeset	265 s.decode(pycompat.sysstr(charset))
30089 040f23ed6963 mail: take --encoding and HGENCODING into account G?bor Stefanik <gabor.stefanik@nng.com> parents: 30072 diff changeset	266 return mimetextqp(s, subtype, codec2iana(charset))
8332 3e544c074459 patchbomb: quoted-printable encode overly long lines Rocco Rutte <pdmef@gmx.net> parents: 8312 diff changeset	267 except UnicodeDecodeError:
30089 040f23ed6963 mail: take --encoding and HGENCODING into account G?bor Stefanik <gabor.stefanik@nng.com> parents: 30072 diff changeset	268 pass
8332 3e544c074459 patchbomb: quoted-printable encode overly long lines Rocco Rutte <pdmef@gmx.net> parents: 8312 diff changeset	269
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	270 return mimetextqp(s, subtype, b"iso-8859-1")
15562 a82b6038ff08 mail: use quoted-printable for mime encoding to avoid too long lines (issue3075) Mads Kiilerich <mads@kiilerich.com> parents: 15561 diff changeset	271
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	272
15562 a82b6038ff08 mail: use quoted-printable for mime encoding to avoid too long lines (issue3075) Mads Kiilerich <mads@kiilerich.com> parents: 15561 diff changeset	273 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	274 '''Return MIME message.
17424 e7cfe3587ea4 fix trivial spelling errors Mads Kiilerich <mads@kiilerich.com> parents: 15562 diff changeset	275 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	276 '''
34310 2d0c306a88c2 mail: encode long unicode lines in emails properly (issue5687) Igor Ippolitov <iippolitov@gmail.com> parents: 33499 diff changeset	277 cs = email.charset.Charset(charset)
2d0c306a88c2 mail: encode long unicode lines in emails properly (issue5687) Igor Ippolitov <iippolitov@gmail.com> parents: 33499 diff changeset	278 msg = email.message.Message()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	279 msg.set_type(pycompat.sysstr(b'text/' + subtype))
34310 2d0c306a88c2 mail: encode long unicode lines in emails properly (issue5687) Igor Ippolitov <iippolitov@gmail.com> parents: 33499 diff changeset	280
15562 a82b6038ff08 mail: use quoted-printable for mime encoding to avoid too long lines (issue3075) Mads Kiilerich <mads@kiilerich.com> parents: 15561 diff changeset	281 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	282 if len(line) > 950:
34310 2d0c306a88c2 mail: encode long unicode lines in emails properly (issue5687) Igor Ippolitov <iippolitov@gmail.com> parents: 33499 diff changeset	283 cs.body_encoding = email.charset.QP
15562 a82b6038ff08 mail: use quoted-printable for mime encoding to avoid too long lines (issue3075) Mads Kiilerich <mads@kiilerich.com> parents: 15561 diff changeset	284 break
a82b6038ff08 mail: use quoted-printable for mime encoding to avoid too long lines (issue3075) Mads Kiilerich <mads@kiilerich.com> parents: 15561 diff changeset	285
41405 9b3be572ff0c mail: document behavior of Python 3 Gregory Szorc <gregory.szorc@gmail.com> parents: 39108 diff changeset	286 # On Python 2, this simply assigns a value. Python 3 inspects
9b3be572ff0c mail: document behavior of Python 3 Gregory Szorc <gregory.szorc@gmail.com> parents: 39108 diff changeset	287 # body and does different things depending on whether it has
9b3be572ff0c mail: document behavior of Python 3 Gregory Szorc <gregory.szorc@gmail.com> parents: 39108 diff changeset	288 # encode() or decode() attributes. We can get the old behavior
9b3be572ff0c mail: document behavior of Python 3 Gregory Szorc <gregory.szorc@gmail.com> parents: 39108 diff changeset	289 # if we pass a str and charset is None and we call set_charset().
9b3be572ff0c mail: document behavior of Python 3 Gregory Szorc <gregory.szorc@gmail.com> parents: 39108 diff changeset	290 # But we may get into trouble later due to Python attempting to
9b3be572ff0c mail: document behavior of Python 3 Gregory Szorc <gregory.szorc@gmail.com> parents: 39108 diff changeset	291 # encode/decode using the registered charset (or attempting to
9b3be572ff0c mail: document behavior of Python 3 Gregory Szorc <gregory.szorc@gmail.com> parents: 39108 diff changeset	292 # use ascii in the absence of a charset).
34310 2d0c306a88c2 mail: encode long unicode lines in emails properly (issue5687) Igor Ippolitov <iippolitov@gmail.com> parents: 33499 diff changeset	293 msg.set_payload(body, cs)
2d0c306a88c2 mail: encode long unicode lines in emails properly (issue5687) Igor Ippolitov <iippolitov@gmail.com> parents: 33499 diff changeset	294
8332 3e544c074459 patchbomb: quoted-printable encode overly long lines Rocco Rutte <pdmef@gmx.net> parents: 8312 diff changeset	295 return msg
7191 d14212218582 mail: mime-encode patches that are utf-8 Christian Ebert <blacktrash@gmx.net> parents: 7114 diff changeset	296
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	297
7114 30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	298 def _charsets(ui):
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	299 '''Obtains charsets to send mail parts not containing patches.'''
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	300 charsets = [cs.lower() for cs in ui.configlist(b'email', b'charsets')]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	301 fallbacks = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	302 encoding.fallbackencoding.lower(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	303 encoding.encoding.lower(),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	304 b'utf-8',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	305 ]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	306 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	307 if cs not in charsets:
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	308 charsets.append(cs)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	309 return [cs for cs in charsets if not cs.endswith(b'ascii')]
7114 30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	310
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	311
7114 30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	312 def _encode(ui, s, charsets):
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	313 '''Returns (converted) string, charset tuple.
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	314 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	315 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	316 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	317 Caveat: Do not use for mail parts containing patches!'''
39023 858fe9625dab mail: fix _encode to be more correct on Python 3 Augie Fackler <augie@google.com> parents: 38332 diff changeset	318 sendcharsets = charsets or _charsets(ui)
858fe9625dab mail: fix _encode to be more correct on Python 3 Augie Fackler <augie@google.com> parents: 38332 diff changeset	319 if not isinstance(s, bytes):
858fe9625dab mail: fix _encode to be more correct on Python 3 Augie Fackler <augie@google.com> parents: 38332 diff changeset	320 # We have unicode data, which we need to try and encode to
858fe9625dab mail: fix _encode to be more correct on Python 3 Augie Fackler <augie@google.com> parents: 38332 diff changeset	321 # some reasonable-ish encoding. Try the encodings the user
858fe9625dab mail: fix _encode to be more correct on Python 3 Augie Fackler <augie@google.com> parents: 38332 diff changeset	322 # wants, and fall back to garbage-in-ascii.
858fe9625dab mail: fix _encode to be more correct on Python 3 Augie Fackler <augie@google.com> parents: 38332 diff changeset	323 for ocs in sendcharsets:
858fe9625dab mail: fix _encode to be more correct on Python 3 Augie Fackler <augie@google.com> parents: 38332 diff changeset	324 try:
858fe9625dab mail: fix _encode to be more correct on Python 3 Augie Fackler <augie@google.com> parents: 38332 diff changeset	325 return s.encode(pycompat.sysstr(ocs)), ocs
858fe9625dab mail: fix _encode to be more correct on Python 3 Augie Fackler <augie@google.com> parents: 38332 diff changeset	326 except UnicodeEncodeError:
858fe9625dab mail: fix _encode to be more correct on Python 3 Augie Fackler <augie@google.com> parents: 38332 diff changeset	327 pass
858fe9625dab mail: fix _encode to be more correct on Python 3 Augie Fackler <augie@google.com> parents: 38332 diff changeset	328 except LookupError:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	329 ui.warn(_(b'ignoring invalid sendcharset: %s\n') % ocs)
39023 858fe9625dab mail: fix _encode to be more correct on Python 3 Augie Fackler <augie@google.com> parents: 38332 diff changeset	330 else:
858fe9625dab mail: fix _encode to be more correct on Python 3 Augie Fackler <augie@google.com> parents: 38332 diff changeset	331 # Everything failed, ascii-armor what we've got and send it.
858fe9625dab mail: fix _encode to be more correct on Python 3 Augie Fackler <augie@google.com> parents: 38332 diff changeset	332 return s.encode('ascii', 'backslashreplace')
858fe9625dab mail: fix _encode to be more correct on Python 3 Augie Fackler <augie@google.com> parents: 38332 diff changeset	333 # We have a bytes of unknown encoding. We'll try and guess a valid
858fe9625dab mail: fix _encode to be more correct on Python 3 Augie Fackler <augie@google.com> parents: 38332 diff changeset	334 # encoding, falling back to pretending we had ascii even though we
858fe9625dab mail: fix _encode to be more correct on Python 3 Augie Fackler <augie@google.com> parents: 38332 diff changeset	335 # know that's wrong.
7114 30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	336 try:
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	337 s.decode('ascii')
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	338 except UnicodeDecodeError:
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7195 diff changeset	339 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	340 try:
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	341 u = s.decode(ics)
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	342 except UnicodeDecodeError:
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	343 continue
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	344 for ocs in sendcharsets:
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	345 try:
39023 858fe9625dab mail: fix _encode to be more correct on Python 3 Augie Fackler <augie@google.com> parents: 38332 diff changeset	346 return u.encode(pycompat.sysstr(ocs)), ocs
7114 30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	347 except UnicodeEncodeError:
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	348 pass
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	349 except LookupError:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	350 ui.warn(_(b'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	351 # if ascii, or all conversion attempts fail, send (broken) ascii
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	352 return s, b'us-ascii'
7114 30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	353
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	354
7114 30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	355 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	356 '''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	357 if not display:
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	358 # split into words?
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	359 s, cs = _encode(ui, s, charsets)
30072 87b8e40eb812 mail: handle renamed email.Header Pulkit Goyal <7895pulkit@gmail.com> parents: 29285 diff changeset	360 return str(email.header.Header(s, cs))
7114 30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	361 return s
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	362
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	363
9948 e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	364 def _addressencode(ui, name, addr, charsets=None):
39106 ebf54a34b7b7 mail: pass in addr to _addressencode() in bytes Yuya Nishihara <yuya@tcha.org> parents: 39105 diff changeset	365 assert isinstance(addr, bytes)
7114 30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	366 name = headencode(ui, name, charsets)
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	367 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	368 acc, dom = addr.split(b'@')
39107 c2327bb3505d mail: call s.decode('ascii') explicitly to see if s is an ascii bytes Yuya Nishihara <yuya@tcha.org> parents: 39106 diff changeset	369 acc.decode('ascii')
39108 d2d89d31cbb5 mail: convert encoding.encoding to sysstr Yuya Nishihara <yuya@tcha.org> parents: 39107 diff changeset	370 dom = dom.decode(pycompat.sysstr(encoding.encoding)).encode('idna')
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	371 addr = b'%s@%s' % (acc, dom)
7114 30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	372 except UnicodeDecodeError:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	373 raise error.Abort(_(b'invalid email address: %s') % addr)
7114 30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	374 except ValueError:
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	375 try:
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	376 # too strict?
39107 c2327bb3505d mail: call s.decode('ascii') explicitly to see if s is an ascii bytes Yuya Nishihara <yuya@tcha.org> parents: 39106 diff changeset	377 addr.decode('ascii')
7114 30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	378 except UnicodeDecodeError:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	379 raise error.Abort(_(b'invalid local address: %s') % addr)
39024 eabdf3c25b8b mail: cope with Py3 unicode antics on email addresses Augie Fackler <augie@google.com> parents: 39023 diff changeset	380 return pycompat.bytesurl(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	381 email.utils.formataddr((name, encoding.strfromlocal(addr)))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	382 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	383
7114 30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	384
9948 e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	385 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	386 '''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	387 if display or not address:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	388 return address or b''
39024 eabdf3c25b8b mail: cope with Py3 unicode antics on email addresses Augie Fackler <augie@google.com> parents: 39023 diff changeset	389 name, addr = email.utils.parseaddr(encoding.strfromlocal(address))
39106 ebf54a34b7b7 mail: pass in addr to _addressencode() in bytes Yuya Nishihara <yuya@tcha.org> parents: 39105 diff changeset	390 return _addressencode(ui, name, encoding.strtolocal(addr), charsets)
9948 e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	391
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	392
9948 e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	393 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	394 '''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	395 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	396 always has one address per item'''
39024 eabdf3c25b8b mail: cope with Py3 unicode antics on email addresses Augie Fackler <augie@google.com> parents: 39023 diff changeset	397 for a in addrs:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	398 assert isinstance(a, bytes), r'%r unexpectedly not a bytestr' % a
9948 e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	399 if display:
e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	400 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	401
e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	402 result = []
39024 eabdf3c25b8b mail: cope with Py3 unicode antics on email addresses Augie Fackler <augie@google.com> parents: 39023 diff changeset	403 for name, addr in email.utils.getaddresses(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	404 [encoding.strfromlocal(a) for a in addrs]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	405 ):
9948 e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	406 if name or addr:
39106 ebf54a34b7b7 mail: pass in addr to _addressencode() in bytes Yuya Nishihara <yuya@tcha.org> parents: 39105 diff changeset	407 r = _addressencode(ui, name, encoding.strtolocal(addr), charsets)
ebf54a34b7b7 mail: pass in addr to _addressencode() in bytes Yuya Nishihara <yuya@tcha.org> parents: 39105 diff changeset	408 result.append(r)
39105 f68ad9b4a43b mail: remove redundant bytesurl() from addrlistencode() Yuya Nishihara <yuya@tcha.org> parents: 39039 diff changeset	409 return result
9948 e5b44a7986d0 mail: add parseaddrlist() function for parsing many addresses at once Marti Raudsepp <marti@juffo.org> parents: 9715 diff changeset	410
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	411
7114 30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	412 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	413 '''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	414 charset and transfer-encoding accordingly.'''
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	415 cs = b'us-ascii'
7114 30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	416 if not display:
30e49d54c537 mail: add methods to handle non-ascii chars Christian Ebert <blacktrash@gmx.net> parents: 6548 diff changeset	417 s, cs = _encode(ui, s, charsets)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	418 return mimetextqp(s, b'plain', cs)
28341 8286f551b7ee patch: when importing from email, RFC2047-decode From/Subject headers Julien Cristau <julien.cristau@logilab.fr> parents: 27619 diff changeset	419
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	420
38332 7b12a2d2eedc py3: ditch email.parser.BytesParser which appears to be plain crap Yuya Nishihara <yuya@tcha.org> parents: 37469 diff changeset	421 if pycompat.ispy3:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	422
38332 7b12a2d2eedc py3: ditch email.parser.BytesParser which appears to be plain crap Yuya Nishihara <yuya@tcha.org> parents: 37469 diff changeset	423 def parse(fp):
7b12a2d2eedc py3: ditch email.parser.BytesParser which appears to be plain crap Yuya Nishihara <yuya@tcha.org> parents: 37469 diff changeset	424 ep = email.parser.Parser()
7b12a2d2eedc py3: ditch email.parser.BytesParser which appears to be plain crap Yuya Nishihara <yuya@tcha.org> parents: 37469 diff changeset	425 # disable the "universal newlines" mode, which isn't binary safe.
7b12a2d2eedc py3: ditch email.parser.BytesParser which appears to be plain crap Yuya Nishihara <yuya@tcha.org> parents: 37469 diff changeset	426 # I have no idea if ascii/surrogateescape is correct, but that's
7b12a2d2eedc py3: ditch email.parser.BytesParser which appears to be plain crap Yuya Nishihara <yuya@tcha.org> parents: 37469 diff changeset	427 # what the standard Python email parser does.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	428 fp = io.TextIOWrapper(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	429 fp, encoding=r'ascii', errors=r'surrogateescape', newline=chr(10)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	430 )
38332 7b12a2d2eedc py3: ditch email.parser.BytesParser which appears to be plain crap Yuya Nishihara <yuya@tcha.org> parents: 37469 diff changeset	431 try:
7b12a2d2eedc py3: ditch email.parser.BytesParser which appears to be plain crap Yuya Nishihara <yuya@tcha.org> parents: 37469 diff changeset	432 return ep.parse(fp)
7b12a2d2eedc py3: ditch email.parser.BytesParser which appears to be plain crap Yuya Nishihara <yuya@tcha.org> parents: 37469 diff changeset	433 finally:
7b12a2d2eedc py3: ditch email.parser.BytesParser which appears to be plain crap Yuya Nishihara <yuya@tcha.org> parents: 37469 diff changeset	434 fp.detach()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	435
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	436
38332 7b12a2d2eedc py3: ditch email.parser.BytesParser which appears to be plain crap Yuya Nishihara <yuya@tcha.org> parents: 37469 diff changeset	437 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	438
38332 7b12a2d2eedc py3: ditch email.parser.BytesParser which appears to be plain crap Yuya Nishihara <yuya@tcha.org> parents: 37469 diff changeset	439 def parse(fp):
7b12a2d2eedc py3: ditch email.parser.BytesParser which appears to be plain crap Yuya Nishihara <yuya@tcha.org> parents: 37469 diff changeset	440 ep = email.parser.Parser()
7b12a2d2eedc py3: ditch email.parser.BytesParser which appears to be plain crap Yuya Nishihara <yuya@tcha.org> parents: 37469 diff changeset	441 return ep.parse(fp)
7b12a2d2eedc py3: ditch email.parser.BytesParser which appears to be plain crap Yuya Nishihara <yuya@tcha.org> parents: 37469 diff changeset	442
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43019 diff changeset	443
28341 8286f551b7ee patch: when importing from email, RFC2047-decode From/Subject headers Julien Cristau <julien.cristau@logilab.fr> parents: 27619 diff changeset	444 def headdecode(s):
8286f551b7ee patch: when importing from email, RFC2047-decode From/Subject headers Julien Cristau <julien.cristau@logilab.fr> parents: 27619 diff changeset	445 '''Decodes RFC-2047 header'''
8286f551b7ee patch: when importing from email, RFC2047-decode From/Subject headers Julien Cristau <julien.cristau@logilab.fr> parents: 27619 diff changeset	446 uparts = []
30072 87b8e40eb812 mail: handle renamed email.Header Pulkit Goyal <7895pulkit@gmail.com> parents: 29285 diff changeset	447 for part, charset in email.header.decode_header(s):
28341 8286f551b7ee patch: when importing from email, RFC2047-decode From/Subject headers Julien Cristau <julien.cristau@logilab.fr> parents: 27619 diff changeset	448 if charset is not None:
8286f551b7ee patch: when importing from email, RFC2047-decode From/Subject headers Julien Cristau <julien.cristau@logilab.fr> parents: 27619 diff changeset	449 try:
8286f551b7ee patch: when importing from email, RFC2047-decode From/Subject headers Julien Cristau <julien.cristau@logilab.fr> parents: 27619 diff changeset	450 uparts.append(part.decode(charset))
8286f551b7ee patch: when importing from email, RFC2047-decode From/Subject headers Julien Cristau <julien.cristau@logilab.fr> parents: 27619 diff changeset	451 continue
8286f551b7ee patch: when importing from email, RFC2047-decode From/Subject headers Julien Cristau <julien.cristau@logilab.fr> parents: 27619 diff changeset	452 except UnicodeDecodeError:
8286f551b7ee patch: when importing from email, RFC2047-decode From/Subject headers Julien Cristau <julien.cristau@logilab.fr> parents: 27619 diff changeset	453 pass
37469 7edf68862fe3 py3: work around weird handling of bytes/unicode in decode_header() Yuya Nishihara <yuya@tcha.org> parents: 37463 diff changeset	454 # On Python 3, decode_header() may return either bytes or unicode
7edf68862fe3 py3: work around weird handling of bytes/unicode in decode_header() Yuya Nishihara <yuya@tcha.org> parents: 37463 diff changeset	455 # depending on whether the header has =?<charset>? or not
7edf68862fe3 py3: work around weird handling of bytes/unicode in decode_header() Yuya Nishihara <yuya@tcha.org> parents: 37463 diff changeset	456 if isinstance(part, type(u'')):
7edf68862fe3 py3: work around weird handling of bytes/unicode in decode_header() Yuya Nishihara <yuya@tcha.org> parents: 37463 diff changeset	457 uparts.append(part)
7edf68862fe3 py3: work around weird handling of bytes/unicode in decode_header() Yuya Nishihara <yuya@tcha.org> parents: 37463 diff changeset	458 continue
28341 8286f551b7ee patch: when importing from email, RFC2047-decode From/Subject headers Julien Cristau <julien.cristau@logilab.fr> parents: 27619 diff changeset	459 try:
8286f551b7ee patch: when importing from email, RFC2047-decode From/Subject headers Julien Cristau <julien.cristau@logilab.fr> parents: 27619 diff changeset	460 uparts.append(part.decode('UTF-8'))
8286f551b7ee patch: when importing from email, RFC2047-decode From/Subject headers Julien Cristau <julien.cristau@logilab.fr> parents: 27619 diff changeset	461 continue
8286f551b7ee patch: when importing from email, RFC2047-decode From/Subject headers Julien Cristau <julien.cristau@logilab.fr> parents: 27619 diff changeset	462 except UnicodeDecodeError:
8286f551b7ee patch: when importing from email, RFC2047-decode From/Subject headers Julien Cristau <julien.cristau@logilab.fr> parents: 27619 diff changeset	463 pass
8286f551b7ee patch: when importing from email, RFC2047-decode From/Subject headers Julien Cristau <julien.cristau@logilab.fr> parents: 27619 diff changeset	464 uparts.append(part.decode('ISO-8859-1'))
31447 067add650129 encoding: factor out unicode variants of from/tolocal() Yuya Nishihara <yuya@tcha.org> parents: 30325 diff changeset	465 return encoding.unitolocal(u' '.join(uparts))

Mercurial > public > mercurial-scm > hg

annotate mercurial/mail.py @ 43117:8ff1ecfadcd1