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

    r2 r391  
    1111
    1212
    13 .. cvar:: PyTypeObject PyModule_Type
     13.. c:var:: PyTypeObject PyModule_Type
    1414
    1515   .. index:: single: ModuleType (in module types)
    1616
    17    This instance of :ctype:`PyTypeObject` represents the Python module type.  This
     17   This instance of :c:type:`PyTypeObject` represents the Python module type.  This
    1818   is exposed to Python programs as ``types.ModuleType``.
    1919
    2020
    21 .. cfunction:: int PyModule_Check(PyObject *p)
     21.. c:function:: int PyModule_Check(PyObject *p)
    2222
    2323   Return true if *p* is a module object, or a subtype of a module object.
     
    2727
    2828
    29 .. cfunction:: int PyModule_CheckExact(PyObject *p)
     29.. c:function:: int PyModule_CheckExact(PyObject *p)
    3030
    3131   Return true if *p* is a module object, but not a subtype of
    32    :cdata:`PyModule_Type`.
     32   :c:data:`PyModule_Type`.
    3333
    3434   .. versionadded:: 2.2
    3535
    3636
    37 .. cfunction:: PyObject* PyModule_New(const char *name)
     37.. c:function:: PyObject* PyModule_New(const char *name)
    3838
    3939   .. index::
     
    4747
    4848
    49 .. cfunction:: PyObject* PyModule_GetDict(PyObject *module)
     49.. c:function:: PyObject* PyModule_GetDict(PyObject *module)
    5050
    5151   .. index:: single: __dict__ (module attribute)
     
    5454   is the same as the :attr:`__dict__` attribute of the module object.  This
    5555   function never fails.  It is recommended extensions use other
    56    :cfunc:`PyModule_\*` and :cfunc:`PyObject_\*` functions rather than directly
     56   :c:func:`PyModule_\*` and :c:func:`PyObject_\*` functions rather than directly
    5757   manipulate a module's :attr:`__dict__`.
    5858
    5959
    60 .. cfunction:: char* PyModule_GetName(PyObject *module)
     60.. c:function:: char* PyModule_GetName(PyObject *module)
    6161
    6262   .. index::
     
    6868
    6969
    70 .. cfunction:: char* PyModule_GetFilename(PyObject *module)
     70.. c:function:: char* PyModule_GetFilename(PyObject *module)
    7171
    7272   .. index::
     
    7979
    8080
    81 .. cfunction:: int PyModule_AddObject(PyObject *module, const char *name, PyObject *value)
     81.. c:function:: int PyModule_AddObject(PyObject *module, const char *name, PyObject *value)
    8282
    8383   Add an object to *module* as *name*.  This is a convenience function which can
     
    8888
    8989
    90 .. cfunction:: int PyModule_AddIntConstant(PyObject *module, const char *name, long value)
     90.. c:function:: int PyModule_AddIntConstant(PyObject *module, const char *name, long value)
    9191
    9292   Add an integer constant to *module* as *name*.  This convenience function can be
     
    9797
    9898
    99 .. cfunction:: int PyModule_AddStringConstant(PyObject *module, const char *name, const char *value)
     99.. c:function:: int PyModule_AddStringConstant(PyObject *module, const char *name, const char *value)
    100100
    101101   Add a string constant to *module* as *name*.  This convenience function can be
     
    105105   .. versionadded:: 2.0
    106106
    107 .. cfunction:: int PyModule_AddIntMacro(PyObject *module, macro)
     107.. c:function:: int PyModule_AddIntMacro(PyObject *module, macro)
    108108
    109109   Add an int constant to *module*. The name and the value are taken from
    110    *macro*. For example ``PyModule_AddConstant(module, AF_INET)`` adds the int
     110   *macro*. For example ``PyModule_AddIntMacro(module, AF_INET)`` adds the int
    111111   constant *AF_INET* with the value of *AF_INET* to *module*.
    112112   Return ``-1`` on error, ``0`` on success.
     
    114114   .. versionadded:: 2.6
    115115
    116 .. cfunction:: int PyModule_AddStringMacro(PyObject *module, macro)
     116.. c:function:: int PyModule_AddStringMacro(PyObject *module, macro)
    117117
    118118   Add a string constant to *module*.
Note: See TracChangeset for help on using the changeset viewer.