Ignore:
Timestamp:
Mar 19, 2014, 11:31:01 PM (11 years ago)
Author:
dmik
Message:

python: Merge vendor 2.7.6 to trunk.

Location:
python/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • python/trunk

  • python/trunk/Doc/c-api/objbuffer.rst

    r2 r391  
    33.. _abstract-buffer:
    44
     5
    56Old Buffer Protocol
    67===================
    78
    8 
    99This section describes the legacy buffer protocol, which has been introduced
    1010in Python 1.6. It is still supported but deprecated in the Python 2.x series.
    11 Python 3.0 introduces a new buffer protocol which fixes weaknesses and
     11Python 3 introduces a new buffer protocol which fixes weaknesses and
    1212shortcomings of the protocol, and has been backported to Python 2.6.  See
    1313:ref:`bufferobjects` for more information.
    1414
    1515
    16 .. cfunction:: int PyObject_AsCharBuffer(PyObject *obj, const char **buffer, Py_ssize_t *buffer_len)
     16.. c:function:: int PyObject_AsCharBuffer(PyObject *obj, const char **buffer, Py_ssize_t *buffer_len)
    1717
    1818   Returns a pointer to a read-only memory location usable as character-based
     
    2525
    2626   .. versionchanged:: 2.5
    27       This function used an :ctype:`int *` type for *buffer_len*. This might
     27      This function used an :c:type:`int *` type for *buffer_len*. This might
    2828      require changes in your code for properly supporting 64-bit systems.
    2929
    3030
    31 .. cfunction:: int PyObject_AsReadBuffer(PyObject *obj, const void **buffer, Py_ssize_t *buffer_len)
     31.. c:function:: int PyObject_AsReadBuffer(PyObject *obj, const void **buffer, Py_ssize_t *buffer_len)
    3232
    3333   Returns a pointer to a read-only memory location containing arbitrary data.
     
    4040
    4141   .. versionchanged:: 2.5
    42       This function used an :ctype:`int *` type for *buffer_len*. This might
     42      This function used an :c:type:`int *` type for *buffer_len*. This might
    4343      require changes in your code for properly supporting 64-bit systems.
    4444
    4545
    46 .. cfunction:: int PyObject_CheckReadBuffer(PyObject *o)
     46.. c:function:: int PyObject_CheckReadBuffer(PyObject *o)
    4747
    4848   Returns ``1`` if *o* supports the single-segment readable buffer interface.
     
    5252
    5353
    54 .. cfunction:: int PyObject_AsWriteBuffer(PyObject *obj, void **buffer, Py_ssize_t *buffer_len)
     54.. c:function:: int PyObject_AsWriteBuffer(PyObject *obj, void **buffer, Py_ssize_t *buffer_len)
    5555
    5656   Returns a pointer to a writeable memory location.  The *obj* argument must
     
    6262
    6363   .. versionchanged:: 2.5
    64       This function used an :ctype:`int *` type for *buffer_len*. This might
     64      This function used an :c:type:`int *` type for *buffer_len*. This might
    6565      require changes in your code for properly supporting 64-bit systems.
    6666
Note: See TracChangeset for help on using the changeset viewer.