##// END OF EJS Templates
python-zstandard: blacken at 80 characters...
python-zstandard: blacken at 80 characters I made this change upstream and it will make it into the next release of python-zstandard. I figured I'd send it Mercurial's way because it will allow us to drop this directory from the black exclusion list. # skip-blame blackening Differential Revision: https://phab.mercurial-scm.org/D7937

File last commit:

r44277:8f26dd09 default
r44605:5e84a96d default
Show More
mail.py
517 lines | 16.4 KiB | text/x-python | PythonLexer
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889 # mail.py - mail sending bits for mercurial
#
# Copyright 2006 Matt Mackall <mpm@selenic.com>
#
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889
Yuya Nishihara
mail: do not print(), use ui.debug() instead...
r30325 from __future__ import absolute_import
Gregory Szorc
mail: use absolute_import
r25957
Augie Fackler
mail: correct import of email module
r19790 import email
Gábor Stefanik
mail: take --encoding and HGENCODING into account...
r30089 import email.charset
Denis Laxalde
py3: use email.generator.BytesGenerator in patch.split()...
r43426 import email.generator
Pulkit Goyal
mail: handle renamed email.Header...
r30072 import email.header
Igor Ippolitov
mail: encode long unicode lines in emails properly (issue5687)...
r34311 import email.message
Yuya Nishihara
py3: ditch email.parser.BytesParser which appears to be plain crap...
r38354 import email.parser
import io
Gregory Szorc
mail: use absolute_import
r25957 import os
import smtplib
import socket
import time
from .i18n import _
Gregory Szorc
py3: manually import getattr where it is needed...
r43359 from .pycompat import (
getattr,
open,
)
Gregory Szorc
mail: use absolute_import
r25957 from . import (
encoding,
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 error,
Gregory Szorc
py3: pass system string to email.message.Message.set_type()...
r36064 pycompat,
Gregory Szorc
mail: use absolute_import
r25957 sslutil,
util,
)
Yuya Nishihara
stringutil: bulk-replace call sites to point to new module...
r37102 from .utils import (
Yuya Nishihara
procutil: bulk-replace function calls to point to new module
r37138 procutil,
Yuya Nishihara
stringutil: bulk-replace call sites to point to new module...
r37102 stringutil,
)
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889
Yuya Nishihara
typing: consolidate "if not globals():" trick...
r44212 if pycompat.TYPE_CHECKING:
Denis Laxalde
mail: add type hints for pytype...
r44024 from typing import Any, List, Tuple, Union
# keep pyflakes happy
assert all((Any, List, Tuple, Union))
Augie Fackler
formatting: blacken the codebase...
r43346
FUJIWARA Katsunori
smtp: add the class to verify the certificate of the SMTP server for STARTTLS...
r18885 class STARTTLS(smtplib.SMTP):
'''Derived class to verify the peer certificate for STARTTLS.
This class allows to pass any keyword arguments to SSL socket creation.
'''
Augie Fackler
formatting: blacken the codebase...
r43346
Gregory Szorc
mail: remove use of sslkwargs
r29251 def __init__(self, ui, host=None, **kwargs):
FUJIWARA Katsunori
smtp: add the class to verify the certificate of the SMTP server for STARTTLS...
r18885 smtplib.SMTP.__init__(self, **kwargs)
Gregory Szorc
sslutil: remove ui from sslkwargs (API)...
r29248 self._ui = ui
timeless
mail: retain hostname for sslutil.wrapsocket (issue5203)...
r28935 self._host = host
FUJIWARA Katsunori
smtp: add the class to verify the certificate of the SMTP server for STARTTLS...
r18885
def starttls(self, keyfile=None, certfile=None):
Denis Laxalde
py3: call SMTP.has_extn() with an str...
r43439 if not self.has_extn("starttls"):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 msg = b"STARTTLS extension not supported by server"
FUJIWARA Katsunori
smtp: add the class to verify the certificate of the SMTP server for STARTTLS...
r18885 raise smtplib.SMTPException(msg)
Denis Laxalde
py3: call SMTP.docmd() with an str...
r43440 (resp, reply) = self.docmd("STARTTLS")
FUJIWARA Katsunori
smtp: add the class to verify the certificate of the SMTP server for STARTTLS...
r18885 if resp == 220:
Augie Fackler
formatting: blacken the codebase...
r43346 self.sock = sslutil.wrapsocket(
self.sock,
keyfile,
certfile,
ui=self._ui,
serverhostname=self._host,
)
Denis Laxalde
py3: use socket.makefile() instead of dropped smtplib.SSLFakeFile...
r43441 self.file = self.sock.makefile("rb")
FUJIWARA Katsunori
smtp: add the class to verify the certificate of the SMTP server for STARTTLS...
r18885 self.helo_resp = None
self.ehlo_resp = None
self.esmtp_features = {}
self.does_esmtp = 0
return (resp, reply)
Augie Fackler
formatting: blacken the codebase...
r43346
timeless@mozdev.org
mail: drop python 2.5 support
r26673 class SMTPS(smtplib.SMTP):
'''Derived class to verify the peer certificate for SMTPS.
FUJIWARA Katsunori
smtp: add the class to verify the certificate of the SMTP server for SMTPS...
r18886
timeless@mozdev.org
mail: drop python 2.5 support
r26673 This class allows to pass any keyword arguments to SSL socket creation.
'''
Augie Fackler
formatting: blacken the codebase...
r43346
def __init__(self, ui, keyfile=None, certfile=None, host=None, **kwargs):
timeless@mozdev.org
mail: drop python 2.5 support
r26673 self.keyfile = keyfile
self.certfile = certfile
smtplib.SMTP.__init__(self, **kwargs)
timeless
mail: retain hostname for sslutil.wrapsocket (issue5203)...
r28935 self._host = host
timeless@mozdev.org
mail: drop python 2.5 support
r26673 self.default_port = smtplib.SMTP_SSL_PORT
Gregory Szorc
sslutil: remove ui from sslkwargs (API)...
r29248 self._ui = ui
timeless@mozdev.org
mail: drop python 2.5 support
r26673
def _get_socket(self, host, port, timeout):
if self.debuglevel > 0:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self._ui.debug(b'connect: %r\n' % ((host, port),))
timeless@mozdev.org
mail: drop python 2.5 support
r26673 new_socket = socket.create_connection((host, port), timeout)
Augie Fackler
formatting: blacken the codebase...
r43346 new_socket = sslutil.wrapsocket(
new_socket,
self.keyfile,
self.certfile,
ui=self._ui,
serverhostname=self._host,
)
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 self.file = new_socket.makefile('rb')
timeless@mozdev.org
mail: drop python 2.5 support
r26673 return new_socket
FUJIWARA Katsunori
smtp: add the class to verify the certificate of the SMTP server for SMTPS...
r18886
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
mail: modernize check for Python-with-TLS...
r39060 def _pyhastls():
Denis Laxalde
mail: add type hints for pytype...
r44024 # type: () -> bool
Augie Fackler
mail: modernize check for Python-with-TLS...
r39060 """Returns true iff Python has TLS support, false otherwise."""
try:
import ssl
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
mail: modernize check for Python-with-TLS...
r39060 getattr(ssl, 'HAS_TLS', False)
return True
except ImportError:
return False
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889 def _smtp(ui):
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 '''build an smtp connection and return a function to send mail'''
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 local_hostname = ui.config(b'smtp', b'local_hostname')
tls = ui.config(b'smtp', b'tls')
Zhigang Wang
smtp: fix for server doesn't support starttls extension...
r13201 # backward compatible: when tls = true, we use starttls.
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 starttls = tls == b'starttls' or stringutil.parsebool(tls)
smtps = tls == b'smtps'
Augie Fackler
mail: modernize check for Python-with-TLS...
r39060 if (starttls or smtps) and not _pyhastls():
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise error.Abort(_(b"can't use TLS: Python SSL support not installed"))
mailhost = ui.config(b'smtp', b'host')
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889 if not mailhost:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise error.Abort(_(b'smtp.host not configured - cannot send mail'))
FUJIWARA Katsunori
smtp: verify the certificate of the SMTP server for STARTTLS/SMTPS...
r18888 if smtps:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ui.note(_(b'(using smtps)\n'))
Gregory Szorc
mail: remove use of sslkwargs
r29251 s = SMTPS(ui, local_hostname=local_hostname, host=mailhost)
FUJIWARA Katsunori
smtp: verify the certificate of the SMTP server for STARTTLS/SMTPS...
r18888 elif starttls:
Gregory Szorc
mail: remove use of sslkwargs
r29251 s = STARTTLS(ui, local_hostname=local_hostname, host=mailhost)
FUJIWARA Katsunori
smtp: verify the certificate of the SMTP server for STARTTLS/SMTPS...
r18888 else:
s = smtplib.SMTP(local_hostname=local_hostname)
FUJIWARA Katsunori
smtp: use 465 as default port for SMTPS...
r19050 if smtps:
defaultport = 465
else:
defaultport = 25
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 mailport = util.getport(ui.config(b'smtp', b'port', defaultport))
ui.note(_(b'sending mail: smtp host %s, port %d\n') % (mailhost, mailport))
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889 s.connect(host=mailhost, port=mailport)
Zhigang Wang
smtp: fix for server doesn't support starttls extension...
r13201 if starttls:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ui.note(_(b'(using starttls)\n'))
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889 s.ehlo()
s.starttls()
s.ehlo()
Gregory Szorc
mail: unsupport smtp.verifycert (BC)...
r29285 if starttls or smtps:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ui.note(_(b'(verifying remote certificate)\n'))
Gregory Szorc
mail: unsupport smtp.verifycert (BC)...
r29285 sslutil.validatesocket(s.sock)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 username = ui.config(b'smtp', b'username')
password = ui.config(b'smtp', b'password')
Denis Laxalde
py3: decode username and password before SMTP login...
r43442 if username:
if password:
password = encoding.strfromlocal(password)
else:
password = ui.getpass()
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889 if username and password:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ui.note(_(b'(authenticating to mail server as %s)\n') % username)
Denis Laxalde
py3: decode username and password before SMTP login...
r43442 username = encoding.strfromlocal(username)
David Soria Parra
email: Catch exceptions during send....
r9246 try:
s.login(username, password)
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except smtplib.SMTPException as inst:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(inst)
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 def send(sender, recipients, msg):
try:
return s.sendmail(sender, recipients, msg)
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except smtplib.SMTPRecipientsRefused as inst:
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 recipients = [r[1] for r in inst.recipients.values()]
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise error.Abort(b'\n' + b'\n'.join(recipients))
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except smtplib.SMTPException as inst:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(inst)
Bryan O'Sullivan
Backed out changeset dc6ed2736c81
r5947
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 return send
Bryan O'Sullivan
Backed out changeset dc6ed2736c81
r5947
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 def _sendmail(ui, sender, recipients, msg):
'''send mail using sendmail.'''
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 program = ui.config(b'email', b'method')
Yuya Nishihara
patchbomb: use procutil.shellquote() instead of shlex to escape email address...
r43366
def stremail(x):
return procutil.shellquote(stringutil.email(encoding.strtolocal(x)))
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 cmdline = b'%s -f %s %s' % (
Augie Fackler
formatting: blacken the codebase...
r43346 program,
stremail(sender),
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b' '.join(map(stremail, recipients)),
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ui.note(_(b'sending mail: %s\n') % cmdline)
fp = procutil.popen(cmdline, b'wb')
Yuya Nishihara
procutil: always popen() in binary mode...
r37476 fp.write(util.tonativeeol(msg))
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 ret = fp.close()
if ret:
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.Abort(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'%s %s'
Augie Fackler
formatting: blacken the codebase...
r43346 % (
Julien Cristau
mail: use procutil.shellsplit instead of bytes.split to parse command...
r44277 os.path.basename(procutil.shellsplit(program)[0]),
Augie Fackler
formatting: blacken the codebase...
r43346 procutil.explainexit(ret),
)
)
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889
Mads Kiilerich
mail: mbox handling as a part of mail handling, refactored from patchbomb
r15560 def _mbox(mbox, sender, recipients, msg):
'''write mails to mbox'''
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 fp = open(mbox, b'ab+')
Mads Kiilerich
mail: mbox handling as a part of mail handling, refactored from patchbomb
r15560 # Should be time.asctime(), but Windows prints 2-characters day
# of month instead of one. Make them print the same thing.
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 date = time.strftime('%a %b %d %H:%M:%S %Y', time.localtime())
Augie Fackler
formatting: blacken the codebase...
r43346 fp.write(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'From %s %s\n'
Augie Fackler
formatting: blacken the codebase...
r43346 % (encoding.strtolocal(sender), encoding.strtolocal(date))
)
Mads Kiilerich
mail: mbox handling as a part of mail handling, refactored from patchbomb
r15560 fp.write(msg)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 fp.write(b'\n\n')
Mads Kiilerich
mail: mbox handling as a part of mail handling, refactored from patchbomb
r15560 fp.close()
Augie Fackler
formatting: blacken the codebase...
r43346
Mads Kiilerich
mail: mbox handling as a part of mail handling, refactored from patchbomb
r15560 def connect(ui, mbox=None):
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 '''make a mail connection. return a function to send mail.
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889 call as sendmail(sender, list-of-recipients, msg).'''
Mads Kiilerich
mail: mbox handling as a part of mail handling, refactored from patchbomb
r15560 if mbox:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 open(mbox, b'wb').close()
Mads Kiilerich
mail: mbox handling as a part of mail handling, refactored from patchbomb
r15560 return lambda s, r, m: _mbox(mbox, s, r, m)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if ui.config(b'email', b'method') == b'smtp':
Bryan O'Sullivan
Backed out changeset dc6ed2736c81
r5947 return _smtp(ui)
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 return lambda s, r, m: _sendmail(ui, s, r, m)
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889
Augie Fackler
formatting: blacken the codebase...
r43346
Mads Kiilerich
notify: add option for writing to mbox...
r15561 def sendmail(ui, sender, recipients, msg, mbox=None):
send = connect(ui, mbox=mbox)
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 return send(sender, recipients, msg)
Bryan O'Sullivan
patchbomb: Validate email config before we start prompting for info.
r4489
Augie Fackler
formatting: blacken the codebase...
r43346
Bryan O'Sullivan
patchbomb: Validate email config before we start prompting for info.
r4489 def validateconfig(ui):
'''determine if we have enough config data to try sending email.'''
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 method = ui.config(b'email', b'method')
if method == b'smtp':
if not ui.config(b'smtp', b'host'):
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.Abort(
_(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'smtp specified as email transport, '
b'but no smtp host configured'
Augie Fackler
formatting: blacken the codebase...
r43346 )
)
Bryan O'Sullivan
patchbomb: Validate email config before we start prompting for info.
r4489 else:
Yuya Nishihara
procutil: bulk-replace function calls to point to new module
r37138 if not procutil.findexe(method):
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.Abort(
Martin von Zweigbergk
cleanup: join string literals that are already on one line...
r43387 _(b'%r specified as email transport, but not in PATH') % method
Augie Fackler
formatting: blacken the codebase...
r43346 )
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114
Gábor Stefanik
mail: take --encoding and HGENCODING into account...
r30089 def codec2iana(cs):
Denis Laxalde
mail: let all charset values be native strings...
r44025 # type: (str) -> str
Gábor Stefanik
mail: take --encoding and HGENCODING into account...
r30089 ''''''
Denis Laxalde
mail: let all charset values be native strings...
r44025 cs = email.charset.Charset(cs).input_charset.lower()
Gábor Stefanik
mail: take --encoding and HGENCODING into account...
r30089
# "latin1" normalizes to "iso8859-1", standard calls for "iso-8859-1"
Denis Laxalde
mail: let all charset values be native strings...
r44025 if cs.startswith("iso") and not cs.startswith("iso-"):
return "iso-" + cs[3:]
Gábor Stefanik
mail: take --encoding and HGENCODING into account...
r30089 return cs
Augie Fackler
formatting: blacken the codebase...
r43346
Denis Laxalde
mail: use a native string for "subtype" value...
r44026 def mimetextpatch(s, subtype='plain', display=False):
# type: (bytes, str, bool) -> email.message.Message
Mads Kiilerich
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)...
r15562 '''Return MIME message suitable for a patch.
Gábor Stefanik
mail: take --encoding and HGENCODING into account...
r30089 Charset will be detected by first trying to decode as us-ascii, then utf-8,
and finally the global encodings. If all those fail, fall back to
ISO-8859-1, an encoding with that allows all byte sequences.
Mads Kiilerich
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)...
r15562 Transfer encodings will be used if necessary.'''
Rocco Rutte
patchbomb: quoted-printable encode overly long lines...
r8332
Denis Laxalde
mail: let all charset values be native strings...
r44025 cs = [
'us-ascii',
'utf-8',
pycompat.sysstr(encoding.encoding),
pycompat.sysstr(encoding.fallbackencoding),
]
Gábor Stefanik
mail: take --encoding and HGENCODING into account...
r30089 if display:
Denis Laxalde
mail: let all charset values be native strings...
r44025 cs = ['us-ascii']
Gábor Stefanik
mail: take --encoding and HGENCODING into account...
r30089 for charset in cs:
Rocco Rutte
patchbomb: quoted-printable encode overly long lines...
r8332 try:
Denis Laxalde
mail: let all charset values be native strings...
r44025 s.decode(charset)
Gábor Stefanik
mail: take --encoding and HGENCODING into account...
r30089 return mimetextqp(s, subtype, codec2iana(charset))
Rocco Rutte
patchbomb: quoted-printable encode overly long lines...
r8332 except UnicodeDecodeError:
Gábor Stefanik
mail: take --encoding and HGENCODING into account...
r30089 pass
Rocco Rutte
patchbomb: quoted-printable encode overly long lines...
r8332
Denis Laxalde
mail: let all charset values be native strings...
r44025 return mimetextqp(s, subtype, "iso-8859-1")
Mads Kiilerich
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)...
r15562
Augie Fackler
formatting: blacken the codebase...
r43346
Mads Kiilerich
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)...
r15562 def mimetextqp(body, subtype, charset):
Denis Laxalde
mail: use a native string for "subtype" value...
r44026 # type: (bytes, str, str) -> email.message.Message
Mads Kiilerich
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)...
r15562 '''Return MIME message.
Mads Kiilerich
fix trivial spelling errors
r17424 Quoted-printable transfer encoding will be used if necessary.
Mads Kiilerich
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)...
r15562 '''
Denis Laxalde
mail: let all charset values be native strings...
r44025 cs = email.charset.Charset(charset)
Igor Ippolitov
mail: encode long unicode lines in emails properly (issue5687)...
r34311 msg = email.message.Message()
Denis Laxalde
mail: use a native string for "subtype" value...
r44026 msg.set_type('text/' + subtype)
Igor Ippolitov
mail: encode long unicode lines in emails properly (issue5687)...
r34311
Mads Kiilerich
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)...
r15562 for line in body.splitlines():
if len(line) > 950:
Igor Ippolitov
mail: encode long unicode lines in emails properly (issue5687)...
r34311 cs.body_encoding = email.charset.QP
Mads Kiilerich
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)...
r15562 break
Gregory Szorc
mail: document behavior of Python 3...
r41450 # On Python 2, this simply assigns a value. Python 3 inspects
# body and does different things depending on whether it has
# encode() or decode() attributes. We can get the old behavior
# if we pass a str and charset is None and we call set_charset().
# But we may get into trouble later due to Python attempting to
# encode/decode using the registered charset (or attempting to
# use ascii in the absence of a charset).
Igor Ippolitov
mail: encode long unicode lines in emails properly (issue5687)...
r34311 msg.set_payload(body, cs)
Rocco Rutte
patchbomb: quoted-printable encode overly long lines...
r8332 return msg
Christian Ebert
mail: mime-encode patches that are utf-8...
r7191
Augie Fackler
formatting: blacken the codebase...
r43346
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 def _charsets(ui):
Denis Laxalde
mail: let all charset values be native strings...
r44025 # type: (Any) -> List[str]
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 '''Obtains charsets to send mail parts not containing patches.'''
Denis Laxalde
mail: add type hints for pytype...
r44024 charsets = [
Denis Laxalde
mail: let all charset values be native strings...
r44025 pycompat.sysstr(cs.lower())
for cs in ui.configlist(b'email', b'charsets')
]
Augie Fackler
formatting: blacken the codebase...
r43346 fallbacks = [
Denis Laxalde
mail: let all charset values be native strings...
r44025 pycompat.sysstr(encoding.fallbackencoding.lower()),
pycompat.sysstr(encoding.encoding.lower()),
'utf-8',
]
Augie Fackler
formatting: blacken the codebase...
r43346 for cs in fallbacks: # find unique charsets while keeping order
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 if cs not in charsets:
charsets.append(cs)
Denis Laxalde
mail: let all charset values be native strings...
r44025 return [cs for cs in charsets if not cs.endswith('ascii')]
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114
Augie Fackler
formatting: blacken the codebase...
r43346
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 def _encode(ui, s, charsets):
Denis Laxalde
mail: let all charset values be native strings...
r44025 # type: (Any, bytes, List[str]) -> Tuple[bytes, str]
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 '''Returns (converted) string, charset tuple.
Finds out best charset by cycling through sendcharsets in descending
Matt Mackall
move encoding bits from util to encoding...
r7948 order. Tries both encoding and fallbackencoding for input. Only as
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 last resort send as is in fake ascii.
Caveat: Do not use for mail parts containing patches!'''
Augie Fackler
mail: fix _encode to be more correct on Python 3...
r39058 sendcharsets = charsets or _charsets(ui)
if not isinstance(s, bytes):
# We have unicode data, which we need to try and encode to
# some reasonable-ish encoding. Try the encodings the user
# wants, and fall back to garbage-in-ascii.
for ocs in sendcharsets:
try:
Denis Laxalde
mail: let all charset values be native strings...
r44025 return s.encode(ocs), ocs
Augie Fackler
mail: fix _encode to be more correct on Python 3...
r39058 except UnicodeEncodeError:
pass
except LookupError:
Denis Laxalde
mail: let all charset values be native strings...
r44025 ui.warn(
_(b'ignoring invalid sendcharset: %s\n')
% pycompat.sysbytes(ocs)
)
Augie Fackler
mail: fix _encode to be more correct on Python 3...
r39058 else:
# Everything failed, ascii-armor what we've got and send it.
Denis Laxalde
mail: let all charset values be native strings...
r44025 return s.encode('ascii', 'backslashreplace'), 'us-ascii'
Augie Fackler
mail: fix _encode to be more correct on Python 3...
r39058 # We have a bytes of unknown encoding. We'll try and guess a valid
# encoding, falling back to pretending we had ascii even though we
# know that's wrong.
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 try:
s.decode('ascii')
except UnicodeDecodeError:
Matt Mackall
move encoding bits from util to encoding...
r7948 for ics in (encoding.encoding, encoding.fallbackencoding):
Denis Laxalde
py3: decode encoding literal before passing to .decode()...
r43638 ics = pycompat.sysstr(ics)
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 try:
u = s.decode(ics)
except UnicodeDecodeError:
continue
for ocs in sendcharsets:
try:
Denis Laxalde
mail: let all charset values be native strings...
r44025 return u.encode(ocs), ocs
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 except UnicodeEncodeError:
pass
except LookupError:
Denis Laxalde
mail: let all charset values be native strings...
r44025 ui.warn(
_(b'ignoring invalid sendcharset: %s\n')
% pycompat.sysbytes(ocs)
)
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 # if ascii, or all conversion attempts fail, send (broken) ascii
Denis Laxalde
mail: let all charset values be native strings...
r44025 return s, 'us-ascii'
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114
Augie Fackler
formatting: blacken the codebase...
r43346
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 def headencode(ui, s, charsets=None, display=False):
Denis Laxalde
mail: let all charset values be native strings...
r44025 # type: (Any, Union[bytes, str], List[str], bool) -> str
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 '''Returns RFC-2047 compliant header from given string.'''
if not display:
# split into words?
s, cs = _encode(ui, s, charsets)
Denis Laxalde
mail: let all charset values be native strings...
r44025 return email.header.Header(s, cs).encode()
Denis Laxalde
mail: let headencode() return a native string...
r43975 return encoding.strfromlocal(s)
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114
Augie Fackler
formatting: blacken the codebase...
r43346
Marti Raudsepp
mail: add parseaddrlist() function for parsing many addresses at once...
r9948 def _addressencode(ui, name, addr, charsets=None):
Denis Laxalde
mail: move strtolocal call in _addressencode()
r44027 # type: (Any, str, str, List[str]) -> str
addr = encoding.strtolocal(addr)
Denis Laxalde
mail: let headencode() return a native string...
r43975 name = headencode(ui, name, charsets)
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 try:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 acc, dom = addr.split(b'@')
Yuya Nishihara
mail: call s.decode('ascii') explicitly to see if s is an ascii bytes
r39143 acc.decode('ascii')
Yuya Nishihara
mail: convert encoding.encoding to sysstr
r39144 dom = dom.decode(pycompat.sysstr(encoding.encoding)).encode('idna')
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 addr = b'%s@%s' % (acc, dom)
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 except UnicodeDecodeError:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise error.Abort(_(b'invalid email address: %s') % addr)
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 except ValueError:
try:
# too strict?
Yuya Nishihara
mail: call s.decode('ascii') explicitly to see if s is an ascii bytes
r39143 addr.decode('ascii')
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 except UnicodeDecodeError:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise error.Abort(_(b'invalid local address: %s') % addr)
Denis Laxalde
mail: let addressencode() / addrlistencode() return native strings...
r43976 return email.utils.formataddr((name, encoding.strfromlocal(addr)))
Augie Fackler
formatting: blacken the codebase...
r43346
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114
Marti Raudsepp
mail: add parseaddrlist() function for parsing many addresses at once...
r9948 def addressencode(ui, address, charsets=None, display=False):
Denis Laxalde
mail: let all charset values be native strings...
r44025 # type: (Any, bytes, List[str], bool) -> str
Marti Raudsepp
mail: add parseaddrlist() function for parsing many addresses at once...
r9948 '''Turns address into RFC-2047 compliant header.'''
if display or not address:
Denis Laxalde
mail: let addressencode() / addrlistencode() return native strings...
r43976 return encoding.strfromlocal(address or b'')
Augie Fackler
mail: cope with Py3 unicode antics on email addresses...
r39059 name, addr = email.utils.parseaddr(encoding.strfromlocal(address))
Denis Laxalde
mail: move strtolocal call in _addressencode()
r44027 return _addressencode(ui, name, addr, charsets)
Marti Raudsepp
mail: add parseaddrlist() function for parsing many addresses at once...
r9948
Augie Fackler
formatting: blacken the codebase...
r43346
Marti Raudsepp
mail: add parseaddrlist() function for parsing many addresses at once...
r9948 def addrlistencode(ui, addrs, charsets=None, display=False):
Denis Laxalde
mail: let all charset values be native strings...
r44025 # type: (Any, List[bytes], List[str], bool) -> List[str]
Marti Raudsepp
mail: add parseaddrlist() function for parsing many addresses at once...
r9948 '''Turns a list of addresses into a list of RFC-2047 compliant headers.
A single element of input list may contain multiple addresses, but output
always has one address per item'''
Denis Laxalde
mail: convert addr to str early in addrlistencode()
r43977 straddrs = []
Augie Fackler
mail: cope with Py3 unicode antics on email addresses...
r39059 for a in addrs:
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 assert isinstance(a, bytes), '%r unexpectedly not a bytestr' % a
Denis Laxalde
mail: convert addr to str early in addrlistencode()
r43977 straddrs.append(encoding.strfromlocal(a))
Marti Raudsepp
mail: add parseaddrlist() function for parsing many addresses at once...
r9948 if display:
Denis Laxalde
mail: convert addr to str early in addrlistencode()
r43977 return [a.strip() for a in straddrs if a.strip()]
Marti Raudsepp
mail: add parseaddrlist() function for parsing many addresses at once...
r9948
result = []
Denis Laxalde
mail: convert addr to str early in addrlistencode()
r43977 for name, addr in email.utils.getaddresses(straddrs):
Marti Raudsepp
mail: add parseaddrlist() function for parsing many addresses at once...
r9948 if name or addr:
Denis Laxalde
mail: move strtolocal call in _addressencode()
r44027 r = _addressencode(ui, name, addr, charsets)
Yuya Nishihara
mail: pass in addr to _addressencode() in bytes...
r39142 result.append(r)
Yuya Nishihara
mail: remove redundant bytesurl() from addrlistencode()...
r39141 return result
Marti Raudsepp
mail: add parseaddrlist() function for parsing many addresses at once...
r9948
Augie Fackler
formatting: blacken the codebase...
r43346
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 def mimeencode(ui, s, charsets=None, display=False):
Denis Laxalde
mail: let all charset values be native strings...
r44025 # type: (Any, bytes, List[str], bool) -> email.message.Message
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 '''creates mime text object, encodes it if needed, and sets
charset and transfer-encoding accordingly.'''
Denis Laxalde
mail: let all charset values be native strings...
r44025 cs = 'us-ascii'
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 if not display:
s, cs = _encode(ui, s, charsets)
Denis Laxalde
mail: use a native string for "subtype" value...
r44026 return mimetextqp(s, 'plain', cs)
Julien Cristau
patch: when importing from email, RFC2047-decode From/Subject headers...
r28341
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
py3: ditch email.parser.BytesParser which appears to be plain crap...
r38354 if pycompat.ispy3:
Augie Fackler
formatting: blacken the codebase...
r43346
Denis Laxalde
py3: use email.generator.BytesGenerator in patch.split()...
r43426 Generator = email.generator.BytesGenerator
Yuya Nishihara
py3: ditch email.parser.BytesParser which appears to be plain crap...
r38354 def parse(fp):
Denis Laxalde
mail: add type hints for pytype...
r44024 # type: (Any) -> email.message.Message
Yuya Nishihara
py3: ditch email.parser.BytesParser which appears to be plain crap...
r38354 ep = email.parser.Parser()
# disable the "universal newlines" mode, which isn't binary safe.
# I have no idea if ascii/surrogateescape is correct, but that's
# what the standard Python email parser does.
Augie Fackler
formatting: blacken the codebase...
r43346 fp = io.TextIOWrapper(
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 fp, encoding='ascii', errors='surrogateescape', newline=chr(10)
Augie Fackler
formatting: blacken the codebase...
r43346 )
Yuya Nishihara
py3: ditch email.parser.BytesParser which appears to be plain crap...
r38354 try:
return ep.parse(fp)
finally:
fp.detach()
Augie Fackler
formatting: blacken the codebase...
r43346
Denis Laxalde
py3: use a BytesParser in notify extension...
r43634 def parsebytes(data):
Denis Laxalde
mail: add type hints for pytype...
r44024 # type: (bytes) -> email.message.Message
Denis Laxalde
py3: use a BytesParser in notify extension...
r43634 ep = email.parser.BytesParser()
return ep.parsebytes(data)
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
mail: black wants to add this blank line...
r43670
Yuya Nishihara
py3: ditch email.parser.BytesParser which appears to be plain crap...
r38354 else:
Augie Fackler
formatting: blacken the codebase...
r43346
Denis Laxalde
py3: use email.generator.BytesGenerator in patch.split()...
r43426 Generator = email.generator.Generator
Yuya Nishihara
py3: ditch email.parser.BytesParser which appears to be plain crap...
r38354 def parse(fp):
Denis Laxalde
mail: add type hints for pytype...
r44024 # type: (Any) -> email.message.Message
Yuya Nishihara
py3: ditch email.parser.BytesParser which appears to be plain crap...
r38354 ep = email.parser.Parser()
return ep.parse(fp)
Denis Laxalde
py3: use a BytesParser in notify extension...
r43634 def parsebytes(data):
Denis Laxalde
mail: add type hints for pytype...
r44024 # type: (str) -> email.message.Message
Denis Laxalde
py3: use a BytesParser in notify extension...
r43634 ep = email.parser.Parser()
return ep.parsestr(data)
Augie Fackler
formatting: blacken the codebase...
r43346
Julien Cristau
patch: when importing from email, RFC2047-decode From/Subject headers...
r28341 def headdecode(s):
Denis Laxalde
mail: add type hints for pytype...
r44024 # type: (Union[email.header.Header, bytes]) -> bytes
Julien Cristau
patch: when importing from email, RFC2047-decode From/Subject headers...
r28341 '''Decodes RFC-2047 header'''
uparts = []
Pulkit Goyal
mail: handle renamed email.Header...
r30072 for part, charset in email.header.decode_header(s):
Julien Cristau
patch: when importing from email, RFC2047-decode From/Subject headers...
r28341 if charset is not None:
try:
uparts.append(part.decode(charset))
continue
Denis Laxalde
mail: catch LookupError in headdecode()...
r43632 except (UnicodeDecodeError, LookupError):
Julien Cristau
patch: when importing from email, RFC2047-decode From/Subject headers...
r28341 pass
Yuya Nishihara
py3: work around weird handling of bytes/unicode in decode_header()...
r37487 # On Python 3, decode_header() may return either bytes or unicode
# depending on whether the header has =?<charset>? or not
if isinstance(part, type(u'')):
uparts.append(part)
continue
Julien Cristau
patch: when importing from email, RFC2047-decode From/Subject headers...
r28341 try:
uparts.append(part.decode('UTF-8'))
continue
except UnicodeDecodeError:
pass
uparts.append(part.decode('ISO-8859-1'))
Yuya Nishihara
encoding: factor out unicode variants of from/tolocal()...
r31447 return encoding.unitolocal(u' '.join(uparts))