--- a/mercurial/mail.py Wed Nov 13 15:23:04 2019 +0100
+++ b/mercurial/mail.py Wed Nov 13 16:46:28 2019 +0100
@@ -395,8 +395,8 @@
def _addressencode(ui, name, addr, charsets=None):
- # type: (Any, str, bytes, List[str]) -> str
- assert isinstance(addr, bytes)
+ # type: (Any, str, str, List[str]) -> str
+ addr = encoding.strtolocal(addr)
name = headencode(ui, name, charsets)
try:
acc, dom = addr.split(b'@')
@@ -420,7 +420,7 @@
if display or not address:
return encoding.strfromlocal(address or b'')
name, addr = email.utils.parseaddr(encoding.strfromlocal(address))
- return _addressencode(ui, name, encoding.strtolocal(addr), charsets)
+ return _addressencode(ui, name, addr, charsets)
def addrlistencode(ui, addrs, charsets=None, display=False):
@@ -438,7 +438,7 @@
result = []
for name, addr in email.utils.getaddresses(straddrs):
if name or addr:
- r = _addressencode(ui, name, encoding.strtolocal(addr), charsets)
+ r = _addressencode(ui, name, addr, charsets)
result.append(r)
return result