#21169: add comment and doc update for getpass change.

This commit is contained in:
R David Murray 2014-04-14 10:28:58 -04:00
parent 04d8a245f1
commit 604453c9ce
2 changed files with 6 additions and 4 deletions

View File

@ -13,10 +13,11 @@ The :mod:`getpass` module provides two functions:
.. function:: getpass(prompt='Password: ', stream=None)
Prompt the user for a password without echoing. The user is prompted using
the string *prompt*, which defaults to ``'Password: '``. On Unix, the prompt
is written to the file-like object *stream*. *stream* defaults to the
controlling terminal (:file:`/dev/tty`) or if that is unavailable to
``sys.stderr`` (this argument is ignored on Windows).
the string *prompt*, which defaults to ``'Password: '``. On Unix, the
prompt is written to the file-like object *stream* using the replace error
handler if needed. *stream* defaults to the controlling terminal
(:file:`/dev/tty`) or if that is unavailable to ``sys.stderr`` (this
argument is ignored on Windows).
If echo free input is unavailable getpass() falls back to printing
a warning message to *stream* and reading from ``sys.stdin`` and

View File

@ -138,6 +138,7 @@ def _raw_input(prompt="", stream=None, input=None):
try:
stream.write(prompt)
except UnicodeEncodeError:
# Use replace error handler to get as much as possible printed.
prompt = prompt.encode(stream.encoding, 'replace')
prompt = prompt.decode(stream.encoding)
stream.write(prompt)