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

    r2 r391  
    99
    1010
    11 .. ctype:: PyTupleObject
     11.. c:type:: PyTupleObject
    1212
    13    This subtype of :ctype:`PyObject` represents a Python tuple object.
     13   This subtype of :c:type:`PyObject` represents a Python tuple object.
    1414
    1515
    16 .. cvar:: PyTypeObject PyTuple_Type
     16.. c:var:: PyTypeObject PyTuple_Type
    1717
    1818   .. index:: single: TupleType (in module types)
    1919
    20    This instance of :ctype:`PyTypeObject` represents the Python tuple type; it is
     20   This instance of :c:type:`PyTypeObject` represents the Python tuple type; it is
    2121   the same object as ``tuple`` and ``types.TupleType`` in the Python layer..
    2222
    2323
    24 .. cfunction:: int PyTuple_Check(PyObject *p)
     24.. c:function:: int PyTuple_Check(PyObject *p)
    2525
    2626   Return true if *p* is a tuple object or an instance of a subtype of the tuple
    … …  
    3131
    3232
    33 .. cfunction:: int PyTuple_CheckExact(PyObject *p)
     33.. c:function:: int PyTuple_CheckExact(PyObject *p)
    3434
    3535   Return true if *p* is a tuple object, but not an instance of a subtype of the
    … …  
    3939
    4040
    41 .. cfunction:: PyObject* PyTuple_New(Py_ssize_t len)
     41.. c:function:: PyObject* PyTuple_New(Py_ssize_t len)
    4242
    4343   Return a new tuple object of size *len*, or *NULL* on failure.
    4444
    4545   .. versionchanged:: 2.5
    46       This function used an :ctype:`int` type for *len*. This might require
     46      This function used an :c:type:`int` type for *len*. This might require
    4747      changes in your code for properly supporting 64-bit systems.
    4848
    4949
    50 .. cfunction:: PyObject* PyTuple_Pack(Py_ssize_t n, ...)
     50.. c:function:: PyObject* PyTuple_Pack(Py_ssize_t n, ...)
    5151
    5252   Return a new tuple object of size *n*, or *NULL* on failure. The tuple values
    … …  
    5757
    5858   .. versionchanged:: 2.5
    59       This function used an :ctype:`int` type for *n*. This might require
     59      This function used an :c:type:`int` type for *n*. This might require
    6060      changes in your code for properly supporting 64-bit systems.
    6161
    6262
    63 .. cfunction:: Py_ssize_t PyTuple_Size(PyObject *p)
     63.. c:function:: Py_ssize_t PyTuple_Size(PyObject *p)
    6464
    6565   Take a pointer to a tuple object, and return the size of that tuple.
    6666
    6767   .. versionchanged:: 2.5
    68       This function returned an :ctype:`int` type. This might require changes
     68      This function returned an :c:type:`int` type. This might require changes
    6969      in your code for properly supporting 64-bit systems.
    7070
    7171
    72 .. cfunction:: Py_ssize_t PyTuple_GET_SIZE(PyObject *p)
     72.. c:function:: Py_ssize_t PyTuple_GET_SIZE(PyObject *p)
    7373
    7474   Return the size of the tuple *p*, which must be non-*NULL* and point to a tuple;
    … …  
    7676
    7777   .. versionchanged:: 2.5
    78       This function returned an :ctype:`int` type. This might require changes
     78      This function returned an :c:type:`int` type. This might require changes
    7979      in your code for properly supporting 64-bit systems.
    8080
    8181
    82 .. cfunction:: PyObject* PyTuple_GetItem(PyObject *p, Py_ssize_t pos)
     82.. c:function:: PyObject* PyTuple_GetItem(PyObject *p, Py_ssize_t pos)
    8383
    8484   Return the object at position *pos* in the tuple pointed to by *p*.  If *pos* is
    … …  
    8686
    8787   .. versionchanged:: 2.5
    88       This function used an :ctype:`int` type for *pos*. This might require
     88      This function used an :c:type:`int` type for *pos*. This might require
    8989      changes in your code for properly supporting 64-bit systems.
    9090
    9191
    92 .. cfunction:: PyObject* PyTuple_GET_ITEM(PyObject *p, Py_ssize_t pos)
     92.. c:function:: PyObject* PyTuple_GET_ITEM(PyObject *p, Py_ssize_t pos)
    9393
    94    Like :cfunc:`PyTuple_GetItem`, but does no checking of its arguments.
     94   Like :c:func:`PyTuple_GetItem`, but does no checking of its arguments.
    9595
    9696   .. versionchanged:: 2.5
    97       This function used an :ctype:`int` type for *pos*. This might require
     97      This function used an :c:type:`int` type for *pos*. This might require
    9898      changes in your code for properly supporting 64-bit systems.
    9999
    100100
    101 .. cfunction:: PyObject* PyTuple_GetSlice(PyObject *p, Py_ssize_t low, Py_ssize_t high)
     101.. c:function:: PyObject* PyTuple_GetSlice(PyObject *p, Py_ssize_t low, Py_ssize_t high)
    102102
    103103   Take a slice of the tuple pointed to by *p* from *low* to *high* and return it
    … …  
    105105
    106106   .. versionchanged:: 2.5
    107       This function used an :ctype:`int` type for *low* and *high*. This might
     107      This function used an :c:type:`int` type for *low* and *high*. This might
    108108      require changes in your code for properly supporting 64-bit systems.
    109109
    110110
    111 .. cfunction:: int PyTuple_SetItem(PyObject *p, Py_ssize_t pos, PyObject *o)
     111.. c:function:: int PyTuple_SetItem(PyObject *p, Py_ssize_t pos, PyObject *o)
    112112
    113113   Insert a reference to object *o* at position *pos* of the tuple pointed to by
    … …  
    119119
    120120   .. versionchanged:: 2.5
    121       This function used an :ctype:`int` type for *pos*. This might require
     121      This function used an :c:type:`int` type for *pos*. This might require
    122122      changes in your code for properly supporting 64-bit systems.
    123123
    124124
    125 .. cfunction:: void PyTuple_SET_ITEM(PyObject *p, Py_ssize_t pos, PyObject *o)
     125.. c:function:: void PyTuple_SET_ITEM(PyObject *p, Py_ssize_t pos, PyObject *o)
    126126
    127    Like :cfunc:`PyTuple_SetItem`, but does no error checking, and should *only* be
     127   Like :c:func:`PyTuple_SetItem`, but does no error checking, and should *only* be
    128128   used to fill in brand new tuples.
    129129
    … …  
    133133
    134134   .. versionchanged:: 2.5
    135       This function used an :ctype:`int` type for *pos*. This might require
     135      This function used an :c:type:`int` type for *pos*. This might require
    136136      changes in your code for properly supporting 64-bit systems.
    137137
    138138
    139 .. cfunction:: int _PyTuple_Resize(PyObject **p, Py_ssize_t newsize)
     139.. c:function:: int _PyTuple_Resize(PyObject **p, Py_ssize_t newsize)
    140140
    141141   Can be used to resize a tuple.  *newsize* will be the new length of the tuple.
    … …  
    154154
    155155   .. versionchanged:: 2.5
    156       This function used an :ctype:`int` type for *newsize*. This might
     156      This function used an :c:type:`int` type for *newsize*. This might
    157157      require changes in your code for properly supporting 64-bit systems.
    158158
    159159
    160 .. cfunction:: int PyTuple_ClearFreeList()
     160.. c:function:: int PyTuple_ClearFreeList()
    161161
    162162   Clear the free list. Return the total number of freed items.
Note: See TracChangeset for help on using the changeset viewer.