mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 02:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Merged revisions 84945 via svnmerge from

Browse source 
svn+ssh://svn.python.org/python/branches/py3k

........
  r84945 | georg.brandl | 2010-09-21 16:48:28 +0200 (Di, 21 Sep 2010) | 1 line

  #9911: doc copyedits.
........
This commit is contained in:
Georg Brandl 2010-10-06 08:56:53 +00:00
parent 57a5e3f0e2
commit 4b05466e25
25 changed files with 39 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/c-api/arg.rst
View file

@ -65,7 +65,7 @@ Unless otherwise stated, buffers are not NUL-terminated.
.. note::
This format does not accept bytes-like objects. If you want to accept
filesystem paths and convert them to C character strings, it is
preferrable to use the ``O&`` format with :cfunc:`PyUnicode_FSConverter`
preferable to use the ``O&`` format with :cfunc:`PyUnicode_FSConverter`
as *converter*.
``s*`` (:class:`str`, :class:`bytes`, :class:`bytearray` or buffer compatible object) [Py_buffer]

2
Doc/c-api/unicode.rst
View file

@ -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, passing :cfunc:`PyUnicode_FSConverter` as the conversion function:
.. cfunction:: int PyUnicode_FSConverter(PyObject* obj, void* result)