Changeset 391 for python/trunk/Doc/c-api/class.rst

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:

• . (modified) (1 prop)
• Doc/c-api/class.rst (modified) (5 diffs)

python/trunk/Doc/c-api/class.rst

@@ -13 +13 @@
 
 
-.. ctype:: PyClassObject
+.. c:type:: PyClassObject
 
    The C structure of the objects used to describe built-in classes.
 
 
-.. cvar:: PyObject* PyClass_Type
+.. c:var:: PyObject* PyClass_Type
 
    .. index:: single: ClassType (in module types)
@@ -26 +26 @@
 
 
-.. cfunction:: int PyClass_Check(PyObject *o)
+.. c:function:: int PyClass_Check(PyObject *o)
 
    Return true if the object *o* is a class object, including instances of types
@@ -32 +32 @@
 
 
-.. cfunction:: int PyClass_IsSubclass(PyObject *klass, PyObject *base)
+.. c:function:: int PyClass_IsSubclass(PyObject *klass, PyObject *base)
 
    Return true if *klass* is a subclass of *base*. Return false in all other cases.
@@ -42 +42 @@
 
 
-.. cvar:: PyTypeObject PyInstance_Type
+.. c:var:: PyTypeObject PyInstance_Type
 
    Type object for class instances.
 
 
-.. cfunction:: int PyInstance_Check(PyObject *obj)
+.. c:function:: int PyInstance_Check(PyObject *obj)
 
    Return true if *obj* is an instance.
 
 
-.. cfunction:: PyObject* PyInstance_New(PyObject *class, PyObject *arg, PyObject *kw)
+.. c:function:: PyObject* PyInstance_New(PyObject *class, PyObject *arg, PyObject *kw)
 
    Create a new instance of a specific class.  The parameters *arg* and *kw* are
@@ -58 +58 @@
 
 
-.. cfunction:: PyObject* PyInstance_NewRaw(PyObject *class, PyObject *dict)
+.. c:function:: PyObject* PyInstance_NewRaw(PyObject *class, PyObject *dict)
 
    Create a new instance of a specific class without calling its constructor.