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

[benjamin.peterson]

https://hg.python.org/cpython/rev/ace662dbfdb6
changeset:   103449:ace662dbfdb6
parent:      103447:330e0e28e9bd
parent:      103448:8e74e76deda1
user:        Benjamin Peterson <benjamin at python.org>
date:        Fri Sep 09 12:46:49 2016 -0700
summary:
  merge 3.5 (#28051)

files:
  Doc/whatsnew/3.5.rst |  11 ++++++-----
  1 files changed, 6 insertions(+), 5 deletions(-)


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
@@ -804,11 +804,12 @@
   :func:`~asyncio.ensure_future`.
   (Contributed by Yury Selivanov.)
 
-* New :meth:`loop.set_task_factory() <asyncio.BaseEventLoop.set_task_factory>`
-  and :meth:`loop.set_task_factory() <asyncio.BaseEventLoop.get_task_factory>`
-  methods to customize the task factory that
-  :meth:`loop.create_task() <asyncio.BaseEventLoop.create_task>` method uses.
-  (Contributed by Yury Selivanov.)
+* New :meth:`loop.set_task_factory()
+  <asyncio.AbstractEventLoop.set_task_factory>` and
+  :meth:`loop.get_task_factory() <asyncio.AbstractEventLoop.get_task_factory>`
+  methods to customize the task factory that :meth:`loop.create_task()
+  <asyncio.BaseEventLoop.create_task>` method uses.  (Contributed by Yury
+  Selivanov.)
 
 * New :meth:`Queue.join() <asyncio.Queue.join>` and
   :meth:`Queue.task_done() <asyncio.Queue.task_done>` queue methods.

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