comparison mercurial/mail.py @ 39039:952bf3c948f0

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

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.

Differential Revision: https://phab.mercurial-scm.org/D4233

39038:2161faf0d24b

def _addressencode(ui, name, addr, charsets=None):
    name = headencode(ui, name, charsets)
    try:
        acc, dom = addr.split(r'@')
        acc = acc.encode('ascii')
        dom = dom.decode(encoding.encoding).encode('idna')
        addr = '%s@%s' % (acc, dom)
    except UnicodeDecodeError:
        raise error.Abort(_('invalid email address: %s') % addr)
    except ValueError:
        try:

39039:952bf3c948f0

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