echochar must be ascii

Author: donbarbos

Doc/library/getpass.rst

@@ -27,9 +27,9 @@ The :mod:`getpass` module provides two functions:
 
    The *echochar* argument controls how user input is displayed while typing.
    If *echochar* is ``None`` (default), input remains hidden. If *echochar* is
-   a string, each typed character is replaced with the given string.
-   For example, ``echochar='*'`` will display asterisks instead of the actual
-   input.
+   a string, each typed character is replaced with the given string. But this
+   string must be ASCII character. For example, ``echochar='*'`` will display
+   asterisks instead of the actual input.
 
    If echo free input is unavailable getpass() falls back to printing
    a warning message to *stream* and reading from ``sys.stdin`` and

Lib/getpass.py

@@ -43,9 +43,8 @@ def unix_getpass(prompt='Password: ', stream=None, *, echochar=None):
 
     Always restores terminal settings before returning.
     """
-    if echochar and not echochar.isascii():
-        return ValueError(f"Invalid echochar: {echochar}. "
-                          "ASCII character expected.")
+    if _is_ascii(echochar):
+        return ValueError(f"'echochar' must be ASCII, got: {echochar!r}")
 
     passwd = None
     with contextlib.ExitStack() as stack:
@@ -82,13 +81,11 @@ def unix_getpass(prompt='Password: ', stream=None, *, echochar=None):
                     tcsetattr_flags |= termios.TCSASOFT
                 try:
                     termios.tcsetattr(fd, tcsetattr_flags, new)
-                    if not echochar:
+                    if echochar:
+                        passwd = _input_with_echochar(prompt, stream, input,
+                                                      echochar)
+                    else:
                         passwd = _raw_input(prompt, stream, input=input)
-                        stream.write('\n')
-                        return passwd
-
-                    passwd = _input_with_echochar(prompt, stream, input,
-                                                  echochar)
                 finally:
                     termios.tcsetattr(fd, tcsetattr_flags, old)
                     stream.flush()  # issue7208
@@ -112,9 +109,8 @@ def win_getpass(prompt='Password: ', stream=None, *, echochar=None):
     """Prompt for password with echo off, using Windows getwch()."""
     if sys.stdin is not sys.__stdin__:
         return fallback_getpass(prompt, stream)
-    if echochar and not echochar.isascii():
-        return ValueError(f"Invalid echochar: {echochar}. "
-                          "ASCII character expected.")
+    if _is_ascii(echochar):
+        return ValueError(f"'echochar' must be ASCII, got: {echochar!r}")
 
     for c in prompt:
         msvcrt.putwch(c)
@@ -127,9 +123,9 @@ def win_getpass(prompt='Password: ', stream=None, *, echochar=None):
             raise KeyboardInterrupt
         if c == '\b':
             if echochar and pw:
-                msvcrt.putwch('\b')
-                msvcrt.putwch(' ')
-                msvcrt.putwch('\b')
+                msvcrt.putch('\b')
+                msvcrt.putch(' ')
+                msvcrt.putch('\b')
             pw = pw[:-1]
         else:
             pw = pw + c
@@ -150,6 +146,13 @@ def fallback_getpass(prompt='Password: ', stream=None):
     return _raw_input(prompt, stream)
 
 
+def _is_ascii(echochar):
+    # ASCII excluding control characters
+    if echochar and not (32 <= ord(echochar) <= 127):
+        return False
+    return True
+
+
 def _raw_input(prompt="", stream=None, input=None):
     # This doesn't save the string in the GNU readline history.
     if not stream: