diff options
| author | Gregory P. Smith <greg@mad-scientist.com> | 2010-01-02 21:38:48 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@mad-scientist.com> | 2010-01-02 21:38:48 (GMT) |
| commit | 1d566cbcf9a868340fdf6fdf40b2d9278dec5427 (patch) | |
| tree | 2348083df0d5c0a94e2663a11be1663c5a1642ad /Doc | |
| parent | 323cabbc1c150ca64c55f7ba1c55b9a45e91e95f (diff) | |
| download | cpython-1d566cbcf9a868340fdf6fdf40b2d9278dec5427.zip cpython-1d566cbcf9a868340fdf6fdf40b2d9278dec5427.tar.gz cpython-1d566cbcf9a868340fdf6fdf40b2d9278dec5427.tar.bz2 | |
Merged revisions 77243 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r77243 | gregory.p.smith | 2010-01-02 13:32:29 -0800 (Sat, 02 Jan 2010) | 10 lines
Merged revisions 77242 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77242 | gregory.p.smith | 2010-01-02 13:29:54 -0800 (Sat, 02 Jan 2010) | 3 lines
Correct documentation for s* z* and w*, the argument that should be passed
is the address of a Py_buffer, not a Py_buffer *.
........
................
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/c-api/arg.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/c-api/arg.rst b/Doc/c-api/arg.rst index 7d7fc56..fc4b941 100644 --- a/Doc/c-api/arg.rst +++ b/Doc/c-api/arg.rst @@ -37,7 +37,7 @@ variable(s) whose address should be passed. including :file:`Python.h`. If the macro is defined, length is a :ctype:`Py_ssize_t` rather than an int. -``s*`` (string, Unicode, or any buffer compatible object) [Py_buffer \*] +``s*`` (string, Unicode, or any buffer compatible object) [Py_buffer] This is similar to ``s``, but the code fills a :ctype:`Py_buffer` structure provided by the caller. In this case the Python string may contain embedded null bytes. Unicode objects pass back a pointer to the default encoded @@ -81,7 +81,7 @@ variable(s) whose address should be passed. Like ``s``, but the Python object may also be ``None``, in which case the C pointer is set to *NULL*. -``z*`` (string or ``None`` or any buffer compatible object) [Py_buffer*] +``z*`` (string or ``None`` or any buffer compatible object) [Py_buffer] This is to ``s*`` as ``z`` is to ``s``. ``z#`` (string or ``None`` or any read buffer compatible object) [const char \*, int] @@ -281,7 +281,7 @@ variable(s) whose address should be passed. or use ``w#`` instead. Only single-segment buffer objects are accepted; :exc:`TypeError` is raised for all others. -``w*`` (read-write byte-oriented buffer) [Py_buffer \*] +``w*`` (read-write byte-oriented buffer) [Py_buffer] This is to ``w`` what ``s*`` is to ``s``. ``w#`` (read-write character buffer) [char \*, int] |