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

[andrew.svetlov]

https://hg.python.org/cpython/rev/a76a61d6fb21
changeset:   98245:a76a61d6fb21
branch:      3.5
parent:      98241:203efe78b3f2
parent:      98244:6b2c27d29ed6
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Sep 24 14:35:16 2015 +0300
summary:
  Merge 3.4 -> 3.5

files:
  Doc/library/asyncio-dev.rst |  10 +++++-----
  Misc/ACKS                   |   1 +
  2 files changed, 6 insertions(+), 5 deletions(-)


diff --git a/Doc/library/asyncio-dev.rst b/Doc/library/asyncio-dev.rst
--- a/Doc/library/asyncio-dev.rst
+++ b/Doc/library/asyncio-dev.rst
@@ -14,14 +14,14 @@
 Debug mode of asyncio
 ---------------------
 
-The implementation of :mod:`asyncio` module has been written for performances.
-To development with asyncio, it's required to enable the debug checks to ease
-the development of asynchronous code.
+The implementation of :mod:`asyncio` has been written for performance.
+In order to ease the development of asynchronous code, you may wish to
+enable *debug mode*.
 
-Setup an application to enable all debug checks:
+To enable all debug checks for an application:
 
 * Enable the asyncio debug mode globally by setting the environment variable
-  :envvar:`PYTHONASYNCIODEBUG` to ``1``
+  :envvar:`PYTHONASYNCIODEBUG` to ``1``, or by calling :meth:`BaseEventLoop.set_debug`.
 * Set the log level of the :ref:`asyncio logger <asyncio-logger>` to
   :py:data:`logging.DEBUG`. For example, call
   ``logging.basicConfig(level=logging.DEBUG)`` at startup.
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -590,6 +590,7 @@
 Konrad Hinsen
 David Hobley
 Tim Hochberg
+Benjamin Hodgson
 Joerg-Cyril Hoehle
 Gregor Hoffleit
 Chris Hoffman

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