Merge 3.4

This commit is contained in:
Zachary Ware 2015-07-07 00:00:43 -05:00
commit 4ffc3d4480
1 changed files with 4 additions and 3 deletions

View File

@ -60,7 +60,7 @@ the definition of all other Python objects.
.. c:macro:: Py_TYPE(o) .. c:macro:: Py_TYPE(o)
This macro is used to access the `ob_type` member of a Python object. This macro is used to access the :attr:`ob_type` member of a Python object.
It expands to:: It expands to::
(((PyObject*)(o))->ob_type) (((PyObject*)(o))->ob_type)
@ -68,7 +68,8 @@ the definition of all other Python objects.
.. c:macro:: Py_REFCNT(o) .. c:macro:: Py_REFCNT(o)
This macro is used to access the `ob_refcnt` member of a Python object. This macro is used to access the :attr:`ob_refcnt` member of a Python
object.
It expands to:: It expands to::
(((PyObject*)(o))->ob_refcnt) (((PyObject*)(o))->ob_refcnt)
@ -76,7 +77,7 @@ the definition of all other Python objects.
.. c:macro:: Py_SIZE(o) .. c:macro:: Py_SIZE(o)
This macro is used to access the `ob_size` member of a Python object. This macro is used to access the :attr:`ob_size` member of a Python object.
It expands to:: It expands to::
(((PyVarObject*)(o))->ob_size) (((PyVarObject*)(o))->ob_size)