diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2015-07-07 05:08:50 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2015-07-07 05:08:50 (GMT) |
| commit | f149ae410be45f285cd592e60f289da7c8b22a0f (patch) | |
| tree | 8e77df263ee84eab77a0a1866af964a6d147f5ee /Doc | |
| parent | 6b42059c60881f7fb41bc4dfff8c936f9d5108ca (diff) | |
| parent | 3d3aedc8ba2d7e97859b408c8ea3565c68364f0c (diff) | |
| download | cpython-f149ae410be45f285cd592e60f289da7c8b22a0f.zip cpython-f149ae410be45f285cd592e60f289da7c8b22a0f.tar.gz cpython-f149ae410be45f285cd592e60f289da7c8b22a0f.tar.bz2 | |
Merge 3.5
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/c-api/structures.rst | 7 | ||||
| -rw-r--r-- | Doc/library/sys.rst | 2 | ||||
| -rw-r--r-- | Doc/library/test.rst | 6 | ||||
| -rw-r--r-- | Doc/whatsnew/3.5.rst | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/Doc/c-api/structures.rst b/Doc/c-api/structures.rst index b925a61..e9e8add 100644 --- a/Doc/c-api/structures.rst +++ b/Doc/c-api/structures.rst @@ -60,7 +60,7 @@ the definition of all other Python objects. .. 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:: (((PyObject*)(o))->ob_type) @@ -68,7 +68,8 @@ the definition of all other Python objects. .. 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:: (((PyObject*)(o))->ob_refcnt) @@ -76,7 +77,7 @@ the definition of all other Python objects. .. 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:: (((PyVarObject*)(o))->ob_size) diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst index 545e674..bb9bdc8 100644 --- a/Doc/library/sys.rst +++ b/Doc/library/sys.rst @@ -1100,7 +1100,7 @@ always available. pass # The following line will fail with a RuntimeError, because - # `wrapper` creates a `wrap(coro)` coroutine: + # ``wrapper`` creates a ``wrap(coro)`` coroutine: foo() See also :func:`get_coroutine_wrapper`. diff --git a/Doc/library/test.rst b/Doc/library/test.rst index 8f2df7c..f7ad475 100644 --- a/Doc/library/test.rst +++ b/Doc/library/test.rst @@ -570,9 +570,9 @@ The :mod:`test.support` module defines the following functions: .. function:: detect_api_mismatch(ref_api, other_api, *, ignore=()): - 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 - ignored in this check specified in `ignore`. + 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 + ignored in this check specified in *ignore*. By default this skips private attributes beginning with '_' but includes all magic methods, i.e. those starting and ending in '__'. diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst index 9713a98..a6d4859 100644 --- a/Doc/whatsnew/3.5.rst +++ b/Doc/whatsnew/3.5.rst @@ -1086,7 +1086,7 @@ Changes in the Python API * The :mod:`socket` module now exports the CAN_RAW_FD_FRAMES constant on linux 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 :mod:`smtplib` module now uses :data:`sys.stderr` instead of previous |