merge 3.4 (closes #22307)

This commit is contained in:
Benjamin Peterson 2014-08-30 21:06:00 -04:00
commit c187f15bb7
1 changed files with 4 additions and 4 deletions

View File

@ -282,10 +282,10 @@ process and user.
.. function:: getlogin()
Return the name of the user logged in on the controlling terminal of the
process. For most purposes, it is more useful to use the environment variables
:envvar:`LOGNAME` or :envvar:`USERNAME` to find out who the user is, or
``pwd.getpwuid(os.getuid())[0]`` to get the login name of the currently
effective user id.
process. For most purposes, it is more useful to use the environment
variables :envvar:`LOGNAME` or :envvar:`USERNAME` to find out who the user
is, or ``pwd.getpwuid(os.getuid())[0]`` to get the login name of the current
real user id.
Availability: Unix, Windows.