diff options
author | Georg Brandl <georg@python.org> | 2010-08-01 21:23:10 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2010-08-01 21:23:10 (GMT) |
commit | ec18c395eac3b42e18b4d03ac80ea9422eaded66 (patch) | |
tree | 2d3a671257eca172ac991e43316ab9af05298453 /Doc/c-api | |
parent | 80ff50a35df8e42ecb959fe7842c6db0a0f953f9 (diff) | |
download | cpython-ec18c395eac3b42e18b4d03ac80ea9422eaded66.zip cpython-ec18c395eac3b42e18b4d03ac80ea9422eaded66.tar.gz cpython-ec18c395eac3b42e18b4d03ac80ea9422eaded66.tar.bz2 |
Merged revisions 83160-83161,83166,83169,83171 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r83160 | georg.brandl | 2010-07-26 10:51:42 +0200 (Mo, 26 Jul 2010) | 1 line
#9381: fix markup.
........
r83161 | georg.brandl | 2010-07-26 11:33:12 +0200 (Mo, 26 Jul 2010) | 1 line
Add Brian Quinlan.
........
r83166 | georg.brandl | 2010-07-26 17:11:49 +0200 (Mo, 26 Jul 2010) | 1 line
Fix grammar.
........
r83169 | georg.brandl | 2010-07-26 19:09:32 +0200 (Mo, 26 Jul 2010) | 1 line
Add Reid.
........
r83171 | georg.brandl | 2010-07-26 23:12:13 +0200 (Mo, 26 Jul 2010) | 1 line
Clarify.
........
Diffstat (limited to 'Doc/c-api')
-rw-r--r-- | Doc/c-api/unicode.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst index b89c0983b..8973207 100644 --- a/Doc/c-api/unicode.rst +++ b/Doc/c-api/unicode.rst @@ -358,7 +358,7 @@ To encode and decode file names and other environment strings, :cdata:`Py_FileSystemEncoding` should be used as the encoding, and ``"surrogateescape"`` should be used as the error handler (:pep:`383`). To encode file names during argument parsing, the ``"O&"`` converter should be -used, passsing :func:PyUnicode_FSConverter as the conversion function: +used, passsing :func:`PyUnicode_FSConverter` as the conversion function: .. cfunction:: int PyUnicode_FSConverter(PyObject* obj, void* result) |