From bae0e623f9e940f72df8e1f097a5b8837544eb03 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sun, 15 Aug 2010 09:15:02 +0000 Subject: Merged revisions 84060 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ........ 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. ........ --- Misc/NEWS | 4 ++++ Modules/posixmodule.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index 3432993..81d3e81 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 951323b..6d92544 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 -- cgit v0.12