From: Victor Stinner Date: Sun, 15 Aug 2010 09:15:02 +0000 (+0000) Subject: Merged revisions 84060 via svnmerge from X-Git-Tag: v3.1.3rc1~338 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bae0e623f9e940f72df8e1f097a5b8837544eb03;p=thirdparty%2FPython%2Fcpython.git Merged revisions 84060 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84060 | victor.stinner | 2010-08-15 11:12:51 +0200 (dim., 15 août 2010) | 4 lines Issue #9603: posix.ttyname() and posix.ctermid() decode the terminal name using the filesystem encoding and surrogateescape error handler. Patch written by David Watson. ........ --- diff --git a/Misc/NEWS b/Misc/NEWS index 343299334636..81d3e81c543c 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -93,6 +93,10 @@ C-API Library ------- +- Issue #9603: posix.ttyname() and posix.ctermid() decode the terminal name + using the filesystem encoding and surrogateescape error handler. Patch + written by David Watson. + - Issue #8688: MANIFEST files created by distutils now include a magic comment indicating they are generated. Manually maintained MANIFESTs without this marker will not be overwritten or removed. diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 951323bc91a0..6d92544982cd 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -1769,7 +1769,7 @@ posix_ttyname(PyObject *self, PyObject *args) #endif if (ret == NULL) return posix_error(); - return PyUnicode_FromString(ret); + return PyUnicode_DecodeFSDefault(ret); } #endif @@ -1791,7 +1791,7 @@ posix_ctermid(PyObject *self, PyObject *noargs) #endif if (ret == NULL) return posix_error(); - return PyUnicode_FromString(buffer); + return PyUnicode_DecodeFSDefault(buffer); } #endif