mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 03:35:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 84063 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84063 | victor.stinner | 2010-08-15 11:33:08 +0200 (dim., 15 août 2010) | 5 lines

  Issue #9605: posix.getlogin() decodes the username with file filesystem
  encoding and surrogateescape error handler. Patch written by David Watson.

  Reindent also posix_getlogin(), and fix a typo in the NEWS file.
........
This commit is contained in:
Victor Stinner 2010-08-15 09:35:13 +00:00
parent bae0e623f9
commit 85675994e6
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Modules/posixmodule.c
View file

@ -4144,13 +4144,12 @@ posix_getlogin(PyObject *self, PyObject *noargs)
name = getlogin();
if (name == NULL) {
if (errno)
posix_error();
posix_error();
else
PyErr_SetString(PyExc_OSError,
"unable to determine login name");
PyErr_SetString(PyExc_OSError, "unable to determine login name");
}
else
result = PyUnicode_FromString(name);
result = PyUnicode_DecodeFSDefault(name);
errno = old_errno;
return result;