comparison mercurial/mail.py @ 43172:9145abd8b96d

py3: decode username and password before SMTP login

smtplib.SMTP.login() requires str on Python 3.

For 'password', we only need to decode when value comes from config as
getpass() returns the correct type already.

43171:54b06bec8914

    if starttls or smtps:
        ui.note(_(b'(verifying remote certificate)\n'))
        sslutil.validatesocket(s.sock)
    username = ui.config(b'smtp', b'username')
    password = ui.config(b'smtp', b'password')
    if username and not password:
        password = ui.getpass()
    if username and password:
        ui.note(_(b'(authenticating to mail server as %s)\n') % username)
        try:
            s.login(username, password)
        except smtplib.SMTPException as inst:
            raise error.Abort(inst)

43172:9145abd8b96d

    if starttls or smtps:
        ui.note(_(b'(verifying remote certificate)\n'))
        sslutil.validatesocket(s.sock)
    username = ui.config(b'smtp', b'username')
    password = ui.config(b'smtp', b'password')
    if username:
        if password:
            password = encoding.strfromlocal(password)
        else:
            password = ui.getpass()
    if username and password:
        ui.note(_(b'(authenticating to mail server as %s)\n') % username)
        username = encoding.strfromlocal(username)
        try:
            s.login(username, password)
        except smtplib.SMTPException as inst:
            raise error.Abort(inst)