This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4233

mail: be more cautious about bytes vs str for py3 compat
ClosedPublic

Authored by durin42 on Aug 9 2018, 10:07 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG952bf3c948f0: mail: be more cautious about bytes vs str for py3 compat
Summary

It's suboptimal that we get a bytes on 2 and a unicode on 3, but it's
easy to work with and I'm disinclined to change anything unless we
start using some sort of type inferencer.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Aug 9 2018, 10:07 PM
Closed by commit rHG952bf3c948f0: mail: be more cautious about bytes vs str for py3 compat (authored by durin42). · Explain WhyAug 9 2018, 11:30 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/mail.py (4 lines)

Diff 10227

mercurial/mail.py

return str(email.header.Header(s, cs)) return str(email.header.Header(s, cs))
return s return s
def _addressencode(ui, name, addr, charsets=None): def _addressencode(ui, name, addr, charsets=None):
name = headencode(ui, name, charsets) name = headencode(ui, name, charsets)
try: try:
acc, dom = addr.split(r'@') acc, dom = addr.split(r'@')
acc = acc.encode('ascii') acc = acc.encode('ascii')
dom = dom.decode(encoding.encoding).encode('idna') if isinstance(dom, bytes):
dom = dom.decode(encoding.encoding)
dom = dom.encode('idna')
addr = '%s@%s' % (acc, dom) addr = '%s@%s' % (acc, dom)
except UnicodeDecodeError: except UnicodeDecodeError:
raise error.Abort(_('invalid email address: %s') % addr) raise error.Abort(_('invalid email address: %s') % addr)
except ValueError: except ValueError:
try: try:
# too strict? # too strict?
addr = addr.encode('ascii') addr = addr.encode('ascii')
except UnicodeDecodeError: except UnicodeDecodeError: