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 3432993..81d3e81 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -93,6 +93,10 @@
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 @@
#endif
if (ret == NULL)
return posix_error();
- return PyUnicode_FromString(ret);
+ return PyUnicode_DecodeFSDefault(ret);
}
#endif
@@ -1791,7 +1791,7 @@
#endif
if (ret == NULL)
return posix_error();
- return PyUnicode_FromString(buffer);
+ return PyUnicode_DecodeFSDefault(buffer);
}
#endif