summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2016-09-09 19:46:49 (GMT)
committerBenjamin Peterson <benjamin@python.org>2016-09-09 19:46:49 (GMT)
commit84f6a8f725c0f7a06d5e77b283d6028bf854443c (patch)
tree598f37a09592043f5b84f7d2a0af82b7185ea933 /Doc
parent6cb526e54de539c6e806c02176d7308d28744a81 (diff)
parentc1db513e368eb485df49a4bd354984136f3a39bd (diff)
downloadcpython-84f6a8f725c0f7a06d5e77b283d6028bf854443c.zip
cpython-84f6a8f725c0f7a06d5e77b283d6028bf854443c.tar.gz
cpython-84f6a8f725c0f7a06d5e77b283d6028bf854443c.tar.bz2
merge 3.5 (#28051)
Diffstat (limited to 'Doc')
-rw-r--r--Doc/whatsnew/3.5.rst11
1 files changed, 6 insertions, 5 deletions
diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst
index 339dbb6..9b71f66 100644
--- a/Doc/whatsnew/3.5.rst
+++ b/Doc/whatsnew/3.5.rst
@@ -804,11 +804,12 @@ Notable changes in the :mod:`asyncio` module since Python 3.4.0:
: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.