[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5

[zach.ware]

https://hg.python.org/cpython/rev/87853f158042
changeset:   96873:87853f158042
parent:      96869:91681c1524da
parent:      96872:39d7b41c04f6
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Tue Jul 07 00:08:50 2015 -0500
summary:
  Merge 3.5

files:
  Doc/c-api/structures.rst |  7 ++++---
  Doc/library/sys.rst      |  2 +-
  Doc/library/test.rst     |  6 +++---
  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
--- a/Doc/c-api/structures.rst
+++ b/Doc/c-api/structures.rst
@@ -60,7 +60,7 @@
 
 .. 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 @@
 
 .. 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 @@
 
 .. 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
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -1100,7 +1100,7 @@
             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
--- a/Doc/library/test.rst
+++ b/Doc/library/test.rst
@@ -570,9 +570,9 @@
 
 .. 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
--- a/Doc/whatsnew/3.5.rst
+++ b/Doc/whatsnew/3.5.rst
@@ -1086,7 +1086,7 @@
 * 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

-- 
Repository URL: https://hg.python.org/cpython