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 *.
  ........
................

diff --git a/Doc/c-api/arg.rst b/Doc/c-api/arg.rst
index 7d7fc56e00e4aea9d0833055e3b493a21170bdde..fc4b941619197f26e8396d6c3791eac15c74e738 100644 (file)
--- 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]