Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/debugcommands.py @ 45777:07b0a687c01a stable
ui: ensure `getpass()` returns bytes
Previously, this could return either bytes or str. I'm not sure which direction
we should go in, but since the input is bytes, I guess bytes makes sense as
output. `debuguigetpass` crashed because it assumed bytes would be returned,
`sslcontext.load_cert_chain()` is happy with bytes or str if the type info in
PyCharm is correct, and `smtplib.SMTP.login()` wants str.
I couldn't figure out how to test this, because the test stalls for input with
`echo test | hg debuguigetpass --config ui.interactive=1`, likely because it
drains stdin before prompting. The custom input reading with `ui.nontty=1` does
not.
I'm also a bit concerned with all of this encoding/decoding. The existing code
in the mail module uses `encoding.strfromlocal()`, but the username and password
are ascii encoded/decoded in `mercurial.url.passwordmgr.find_user_password()`
with `pycompat.{str,bytes}url()`. I'm not sure if this inconsistency could
cause subtle compatability issues.
Differential Revision: https://phab.mercurial-scm.org/D9375
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Mon, 23 Nov 2020 11:47:06 -0500 |
parents | 0428978bca22 |
children | e614eeb794f9 2cf61e66c6d0 |
comparison
equal
deleted
inserted
replaced
45776:139b334c9392 | 45777:07b0a687c01a |
---|---|
3785 norepo=True, | 3785 norepo=True, |
3786 ) | 3786 ) |
3787 def debuguigetpass(ui, prompt=b''): | 3787 def debuguigetpass(ui, prompt=b''): |
3788 """show prompt to type password""" | 3788 """show prompt to type password""" |
3789 r = ui.getpass(prompt) | 3789 r = ui.getpass(prompt) |
3790 if r is not None: | |
3791 r = encoding.strtolocal(r) | |
3792 else: | |
3793 r = b"<default response>" | |
3790 ui.writenoi18n(b'response: %s\n' % r) | 3794 ui.writenoi18n(b'response: %s\n' % r) |
3791 | 3795 |
3792 | 3796 |
3793 @command( | 3797 @command( |
3794 b'debuguiprompt', | 3798 b'debuguiprompt', |