# HG changeset patch # User Matt Harbison # Date 2021-08-02 14:51:19 # Node ID 064cd182555f9d0caa50c9f05fa1c0499b3a00fe # Parent 48f07adbda983363af1ce84fd692a42f303e0093 windows: avoid a bytes vs unicode crash reading passwords on py2 This broke in 5b3513177f2b. Specifically, after typing in the password on py2, it would crash with: TypeError: putwch() argument 1 must be cannot convert raw buffers, not str diff --git a/mercurial/windows.py b/mercurial/windows.py --- a/mercurial/windows.py +++ b/mercurial/windows.py @@ -200,20 +200,20 @@ def get_password(): This shouldn't be called directly- use ``ui.getpass()`` instead, which checks if the session is interactive first. """ - pw = "" + pw = u"" while True: c = msvcrt.getwch() # pytype: disable=module-attr - if c == '\r' or c == '\n': + if c == u'\r' or c == u'\n': break - if c == '\003': + if c == u'\003': raise KeyboardInterrupt - if c == '\b': + if c == u'\b': pw = pw[:-1] else: pw = pw + c - msvcrt.putwch('\r') # pytype: disable=module-attr - msvcrt.putwch('\n') # pytype: disable=module-attr - return encoding.strtolocal(pw) + msvcrt.putwch(u'\r') # pytype: disable=module-attr + msvcrt.putwch(u'\n') # pytype: disable=module-attr + return encoding.unitolocal(pw) class winstdout(object):