diff options
| author | Martin Panter <vadmium> | 2015-08-25 05:25:21 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium> | 2015-08-25 05:25:21 (GMT) |
| commit | 36f22a2820d4e2dc31720e90ccc14050838081ad (patch) | |
| tree | da067dcaeacbd14ce64ad872ed02cf465e6d235f /Doc/c-api | |
| parent | ef4554f71653ff90a84d9071a7643cc3edcc616f (diff) | |
| parent | 78d5033337d7fd270f8c1c7153ccf7be84b52048 (diff) | |
| download | cpython-36f22a2820d4e2dc31720e90ccc14050838081ad.zip cpython-36f22a2820d4e2dc31720e90ccc14050838081ad.tar.gz cpython-36f22a2820d4e2dc31720e90ccc14050838081ad.tar.bz2 | |
Issue #24808: Merge 3.4 into 3.5; adjust new tp_as_async field
Diffstat (limited to 'Doc/c-api')
| -rw-r--r-- | Doc/c-api/typeobj.rst | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Doc/c-api/typeobj.rst b/Doc/c-api/typeobj.rst index ed83e82..b5113aa 100644 --- a/Doc/c-api/typeobj.rst +++ b/Doc/c-api/typeobj.rst @@ -94,7 +94,7 @@ type objects) *must* have the :attr:`ob_size` field. This field is not inherited by subtypes. -.. c:member:: char* PyTypeObject.tp_name +.. c:member:: const char* PyTypeObject.tp_name Pointer to a NUL-terminated string containing the name of the type. For types that are accessible as module globals, the string should be the full module @@ -372,7 +372,7 @@ type objects) *must* have the :attr:`ob_size` field. inherited individually. -.. c:member:: long PyTypeObject.tp_flags +.. c:member:: unsigned long PyTypeObject.tp_flags This field is a bit mask of various flags. Some flags indicate variant semantics for certain situations; others are used to indicate that certain @@ -472,7 +472,7 @@ type objects) *must* have the :attr:`ob_size` field. .. versionadded:: 3.4 -.. c:member:: char* PyTypeObject.tp_doc +.. c:member:: const char* PyTypeObject.tp_doc An optional pointer to a NUL-terminated C string giving the docstring for this type object. This is exposed as the :attr:`__doc__` attribute on the type and @@ -619,7 +619,7 @@ type objects) *must* have the :attr:`ob_size` field. +----------------+------------+ -.. c:member:: long PyTypeObject.tp_weaklistoffset +.. c:member:: Py_ssize_t PyTypeObject.tp_weaklistoffset If the instances of this type are weakly referenceable, this field is greater than zero and contains the offset in the instance structure of the weak @@ -786,7 +786,7 @@ type objects) *must* have the :attr:`ob_size` field. .. XXX explain. -.. c:member:: long PyTypeObject.tp_dictoffset +.. c:member:: Py_ssize_t PyTypeObject.tp_dictoffset If the instances of this type have a dictionary containing instance variables, this field is non-zero and contains the offset in the instances of the type of |