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

    r2 r391  
    77
    88
    9 .. cfunction:: int PyMapping_Check(PyObject *o)
     9.. c:function:: int PyMapping_Check(PyObject *o)
    1010
    1111   Return ``1`` if the object provides mapping protocol, and ``0`` otherwise.  This
    … …  
    1313
    1414
    15 .. cfunction:: Py_ssize_t PyMapping_Size(PyObject *o)
     15.. c:function:: Py_ssize_t PyMapping_Size(PyObject *o)
    1616               Py_ssize_t PyMapping_Length(PyObject *o)
    1717
    … …  
    2323
    2424   .. versionchanged:: 2.5
    25       These functions returned an :ctype:`int` type. This might require
     25      These functions returned an :c:type:`int` type. This might require
    2626      changes in your code for properly supporting 64-bit systems.
    2727
    2828
    29 .. cfunction:: int PyMapping_DelItemString(PyObject *o, char *key)
     29.. c:function:: int PyMapping_DelItemString(PyObject *o, char *key)
    3030
    3131   Remove the mapping for object *key* from the object *o*. Return ``-1`` on
    … …  
    3333
    3434
    35 .. cfunction:: int PyMapping_DelItem(PyObject *o, PyObject *key)
     35.. c:function:: int PyMapping_DelItem(PyObject *o, PyObject *key)
    3636
    3737   Remove the mapping for object *key* from the object *o*. Return ``-1`` on
    … …  
    3939
    4040
    41 .. cfunction:: int PyMapping_HasKeyString(PyObject *o, char *key)
     41.. c:function:: int PyMapping_HasKeyString(PyObject *o, char *key)
    4242
    4343   On success, return ``1`` if the mapping object has the key *key* and ``0``
    … …  
    4646
    4747
    48 .. cfunction:: int PyMapping_HasKey(PyObject *o, PyObject *key)
     48.. c:function:: int PyMapping_HasKey(PyObject *o, PyObject *key)
    4949
    5050   Return ``1`` if the mapping object has the key *key* and ``0`` otherwise.
    … …  
    5353
    5454
    55 .. cfunction:: PyObject* PyMapping_Keys(PyObject *o)
     55.. c:function:: PyObject* PyMapping_Keys(PyObject *o)
    5656
    5757   On success, return a list of the keys in object *o*.  On failure, return *NULL*.
    … …  
    5959
    6060
    61 .. cfunction:: PyObject* PyMapping_Values(PyObject *o)
     61.. c:function:: PyObject* PyMapping_Values(PyObject *o)
    6262
    6363   On success, return a list of the values in object *o*.  On failure, return
    … …  
    6565
    6666
    67 .. cfunction:: PyObject* PyMapping_Items(PyObject *o)
     67.. c:function:: PyObject* PyMapping_Items(PyObject *o)
    6868
    6969   On success, return a list of the items in object *o*, where each item is a tuple
    … …  
    7272
    7373
    74 .. cfunction:: PyObject* PyMapping_GetItemString(PyObject *o, char *key)
     74.. c:function:: PyObject* PyMapping_GetItemString(PyObject *o, char *key)
    7575
    7676   Return element of *o* corresponding to the object *key* or *NULL* on failure.
    … …  
    7878
    7979
    80 .. cfunction:: int PyMapping_SetItemString(PyObject *o, char *key, PyObject *v)
     80.. c:function:: int PyMapping_SetItemString(PyObject *o, char *key, PyObject *v)
    8181
    8282   Map the object *key* to the value *v* in object *o*. Returns ``-1`` on failure.
Note: See TracChangeset for help on using the changeset viewer.