Mercurial > hg
diff hgext/notify.py @ 43576:14b96072797d
mail: let addressencode() / addrlistencode() return native strings
Avoids conversion to "str" on py3.
author | Denis Laxalde <denis@laxalde.org> |
---|---|
date | Sat, 09 Nov 2019 15:16:52 +0100 |
parents | 67b4439c09b2 |
children | 947e6df4ff77 |
line wrap: on
line diff
--- a/hgext/notify.py Sat Nov 09 12:45:14 2019 +0100 +++ b/hgext/notify.py Sat Nov 09 15:16:52 2019 +0100 @@ -430,14 +430,14 @@ sender = self.ui.config(b'email', b'from') or self.ui.username() if b'@' not in sender or b'@localhost' in sender: sender = self.fixmail(sender) - msg['From'] = encoding.strfromlocal( - mail.addressencode(self.ui, sender, self.charsets, self.test) + msg['From'] = mail.addressencode( + self.ui, sender, self.charsets, self.test ) msg['X-Hg-Notification'] = 'changeset %s' % ctx if not msg['Message-Id']: msg['Message-Id'] = messageid(ctx, self.domain, self.messageidseed) - msg['To'] = encoding.strfromlocal(b', '.join(sorted(subs))) + msg['To'] = ', '.join(sorted(subs)) msgtext = msg.as_bytes() if pycompat.ispy3 else msg.as_string() if self.test: