mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 03:22:27 +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

3
Misc/NEWS
View file

@ -93,6 +93,9 @@ C-API
Library Library
------- -------
- Issue #9605: posix.getlogin() decodes the username with file filesystem
encoding and surrogateescape error handler. Patch written by David Watson.
- Issue #9603: posix.ttyname() and posix.ctermid() decode the terminal name - Issue #9603: posix.ttyname() and posix.ctermid() decode the terminal name
using the filesystem encoding and surrogateescape error handler. Patch using the filesystem encoding and surrogateescape error handler. Patch
written by David Watson. written by David Watson.

7
Modules/posixmodule.c
View file

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