diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2016-06-02 01:26:50 (GMT) |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2016-06-02 01:26:50 (GMT) |
| commit | fa6de5cddf9cd2029b7c2a0fe8b4c5ef27a1273e (patch) | |
| tree | 1642ad4971dcea11e23e44a85af6f3403f3f5db3 | |
| parent | c5f4036e6c38f27ecfc24a99b80ba2a47a497403 (diff) | |
| parent | 1b207c55a446ab8b8bae2efc8407ee130ba62012 (diff) | |
| download | cpython-fa6de5cddf9cd2029b7c2a0fe8b4c5ef27a1273e.zip cpython-fa6de5cddf9cd2029b7c2a0fe8b4c5ef27a1273e.tar.gz cpython-fa6de5cddf9cd2029b7c2a0fe8b4c5ef27a1273e.tar.bz2 | |
Issue #12243: Merge from 3.5
| -rw-r--r-- | Doc/library/getpass.rst | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Doc/library/getpass.rst b/Doc/library/getpass.rst index 211563e..94cf95f 100644 --- a/Doc/library/getpass.rst +++ b/Doc/library/getpass.rst @@ -23,8 +23,6 @@ The :mod:`getpass` module provides two functions: a warning message to *stream* and reading from ``sys.stdin`` and issuing a :exc:`GetPassWarning`. - Availability: Macintosh, Unix, Windows. - .. note:: If you call getpass from within IDLE, the input may be done in the terminal you launched IDLE from rather than the idle window itself. @@ -36,7 +34,7 @@ The :mod:`getpass` module provides two functions: .. function:: getuser() - Return the "login name" of the user. Availability: Unix, Windows. + Return the "login name" of the user. This function checks the environment variables :envvar:`LOGNAME`, :envvar:`USER`, :envvar:`LNAME` and :envvar:`USERNAME`, in order, and returns |