Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge 3.5

This commit is contained in:
Zachary Ware 2015-07-07 00:08:50 -05:00
parent 6b42059c60 3d3aedc8ba
commit f149ae410b
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Doc/c-api/structures.rst
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)

2
Doc/library/sys.rst
View File

@ -1100,7 +1100,7 @@ always available.
pass pass
# The following line will fail with a RuntimeError, because # The following line will fail with a RuntimeError, because
# `wrapper` creates a `wrap(coro)` coroutine: # ``wrapper`` creates a ``wrap(coro)`` coroutine:
foo() foo()
See also :func:`get_coroutine_wrapper`. See also :func:`get_coroutine_wrapper`.

6
Doc/library/test.rst
View File

@ -570,9 +570,9 @@ The :mod:`test.support` module defines the following functions:
.. function:: detect_api_mismatch(ref_api, other_api, *, ignore=()): .. function:: detect_api_mismatch(ref_api, other_api, *, ignore=()):
Returns the set of attributes, functions or methods of `ref_api` not Returns the set of attributes, functions or methods of *ref_api* not
found on `other_api`, except for a defined list of items to be found on *other_api*, except for a defined list of items to be
ignored in this check specified in `ignore`. ignored in this check specified in *ignore*.
By default this skips private attributes beginning with '_' but By default this skips private attributes beginning with '_' but
includes all magic methods, i.e. those starting and ending in '__'. includes all magic methods, i.e. those starting and ending in '__'.

2
Doc/whatsnew/3.5.rst
View File

@ -1086,7 +1086,7 @@ Changes in the Python API
* The :mod:`socket` module now exports the CAN_RAW_FD_FRAMES constant on linux * The :mod:`socket` module now exports the CAN_RAW_FD_FRAMES constant on linux
3.6 and greater. 3.6 and greater.
* The `pygettext.py` Tool now uses the standard +NNNN format for timezones in * The ``pygettext.py`` Tool now uses the standard +NNNN format for timezones in
the POT-Creation-Date header. the POT-Creation-Date header.
* The :mod:`smtplib` module now uses :data:`sys.stderr` instead of previous * The :mod:`smtplib` module now uses :data:`sys.stderr` instead of previous