comparison mercurial/mail.py @ 39107:c2327bb3505d

mail: call s.decode('ascii') explicitly to see if s is an ascii bytes

39106:ebf54a34b7b7

def _addressencode(ui, name, addr, charsets=None):
    assert isinstance(addr, bytes)
    name = headencode(ui, name, charsets)
    try:
        acc, dom = addr.split('@')
        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:
            # too strict?
            addr = addr.encode('ascii')
        except UnicodeDecodeError:
            raise error.Abort(_('invalid local address: %s') % addr)
    return pycompat.bytesurl(
        email.utils.formataddr((name, encoding.strfromlocal(addr))))

39107:c2327bb3505d

def _addressencode(ui, name, addr, charsets=None):
    assert isinstance(addr, bytes)
    name = headencode(ui, name, charsets)
    try:
        acc, dom = addr.split('@')
        acc.decode('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:
            # too strict?
            addr.decode('ascii')
        except UnicodeDecodeError:
            raise error.Abort(_('invalid local address: %s') % addr)
    return pycompat.bytesurl(
        email.utils.formataddr((name, encoding.strfromlocal(addr))))