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/bytearray.rst

    r2 r391  
    1111
    1212
    13 .. ctype:: PyByteArrayObject
     13.. c:type:: PyByteArrayObject
    1414
    15    This subtype of :ctype:`PyObject` represents a Python bytearray object.
     15   This subtype of :c:type:`PyObject` represents a Python bytearray object.
    1616
    1717
    18 .. cvar:: PyTypeObject PyByteArray_Type
     18.. c:var:: PyTypeObject PyByteArray_Type
    1919
    20    This instance of :ctype:`PyTypeObject` represents the Python bytearray type;
     20   This instance of :c:type:`PyTypeObject` represents the Python bytearray type;
    2121   it is the same object as ``bytearray`` in the Python layer.
    2222
    … …  
    2424^^^^^^^^^^^^^^^^^
    2525
    26 .. cfunction:: int PyByteArray_Check(PyObject *o)
     26.. c:function:: int PyByteArray_Check(PyObject *o)
    2727
    2828   Return true if the object *o* is a bytearray object or an instance of a
    … …  
    3030
    3131
    32 .. cfunction:: int PyByteArray_CheckExact(PyObject *o)
     32.. c:function:: int PyByteArray_CheckExact(PyObject *o)
    3333
    3434   Return true if the object *o* is a bytearray object, but not an instance of a
    … …  
    3939^^^^^^^^^^^^^^^^^^^^
    4040
    41 .. cfunction:: PyObject* PyByteArray_FromObject(PyObject *o)
     41.. c:function:: PyObject* PyByteArray_FromObject(PyObject *o)
    4242
    4343   Return a new bytearray object from any object, *o*, that implements the
    … …  
    4747
    4848
    49 .. cfunction:: PyObject* PyByteArray_FromStringAndSize(const char *string, Py_ssize_t len)
     49.. c:function:: PyObject* PyByteArray_FromStringAndSize(const char *string, Py_ssize_t len)
    5050
    5151   Create a new bytearray object from *string* and its length, *len*.  On
    … …  
    5353
    5454
    55 .. cfunction:: PyObject* PyByteArray_Concat(PyObject *a, PyObject *b)
     55.. c:function:: PyObject* PyByteArray_Concat(PyObject *a, PyObject *b)
    5656
    5757   Concat bytearrays *a* and *b* and return a new bytearray with the result.
    5858
    5959
    60 .. cfunction:: Py_ssize_t PyByteArray_Size(PyObject *bytearray)
     60.. c:function:: Py_ssize_t PyByteArray_Size(PyObject *bytearray)
    6161
    6262   Return the size of *bytearray* after checking for a *NULL* pointer.
    6363
    6464
    65 .. cfunction:: char* PyByteArray_AsString(PyObject *bytearray)
     65.. c:function:: char* PyByteArray_AsString(PyObject *bytearray)
    6666
    6767   Return the contents of *bytearray* as a char array after checking for a
    … …  
    6969
    7070
    71 .. cfunction:: int PyByteArray_Resize(PyObject *bytearray, Py_ssize_t len)
     71.. c:function:: int PyByteArray_Resize(PyObject *bytearray, Py_ssize_t len)
    7272
    7373   Resize the internal buffer of *bytearray* to *len*.
    … …  
    7878These macros trade safety for speed and they don't check pointers.
    7979
    80 .. cfunction:: char* PyByteArray_AS_STRING(PyObject *bytearray)
     80.. c:function:: char* PyByteArray_AS_STRING(PyObject *bytearray)
    8181
    82    Macro version of :cfunc:`PyByteArray_AsString`.
     82   Macro version of :c:func:`PyByteArray_AsString`.
    8383
    8484
    85 .. cfunction:: Py_ssize_t PyByteArray_GET_SIZE(PyObject *bytearray)
     85.. c:function:: Py_ssize_t PyByteArray_GET_SIZE(PyObject *bytearray)
    8686
    87    Macro version of :cfunc:`PyByteArray_Size`.
     87   Macro version of :c:func:`PyByteArray_Size`.
Note: See TracChangeset for help on using the changeset viewer.