traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #12243: Merge from 3.5

This commit is contained in:
Berker Peksag 2016-06-01 18:26:50 -07:00
parent c5f4036e6c 1b207c55a4
commit fa6de5cddf
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Doc/library/getpass.rst
View File

@ -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