summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2015-09-24 14:36:00 +0300
committerAndrew Svetlov <andrew.svetlov@gmail.com>2015-09-24 14:36:00 +0300
commit038b61fbb54aceea62b44a45ee4ff4723a09ee7f (patch)
tree2a1748675b203db73f38310f96e8a5eeee3f9cd6
parentac2d87a157845e78793fb6bc5421c7dbe04b2e27 (diff)
parent1c99e529dde252f6d1e3d727aa9d2deef97c231c (diff)
downloadcpython-git-038b61fbb54aceea62b44a45ee4ff4723a09ee7f.tar.gz
Merge 3.5 -> default
-rw-r--r--Doc/library/asyncio-dev.rst10
-rw-r--r--Misc/ACKS1
2 files changed, 6 insertions, 5 deletions
diff --git a/Doc/library/asyncio-dev.rst b/Doc/library/asyncio-dev.rst
index e27cef8852..48e7666bbb 100644
--- a/Doc/library/asyncio-dev.rst
+++ b/Doc/library/asyncio-dev.rst
@@ -14,14 +14,14 @@ This page lists common traps and explains how to avoid them.
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
index 3d6d75d902..d590073b03 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -590,6 +590,7 @@ Richie Hindle
Konrad Hinsen
David Hobley
Tim Hochberg
+Benjamin Hodgson
Joerg-Cyril Hoehle
Gregor Hoffleit
Chris Hoffman