summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYury Selivanov <yselivanov@sprymix.com>2015-09-13 01:39:16 -0400
committerYury Selivanov <yselivanov@sprymix.com>2015-09-13 01:39:16 -0400
commitbd316c71aeb085d78729e8565fd35edad054058c (patch)
treee85f7358cd6dfcf19a6f52400ff5226864135d81
parentf1e6faec6782144187fb6e788ba0c57a62728714 (diff)
parent72dab131054093ed1b93fcbe0d88ab2e59d4a267 (diff)
downloadcpython-git-bd316c71aeb085d78729e8565fd35edad054058c.tar.gz
Merge 3.5
-rw-r--r--Doc/whatsnew/3.5.rst14
1 files changed, 7 insertions, 7 deletions
diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst
index 55c96f28bd..5d46eb5d23 100644
--- a/Doc/whatsnew/3.5.rst
+++ b/Doc/whatsnew/3.5.rst
@@ -761,13 +761,13 @@ all changes introduced in Python 3.5 have also been backported to Python 3.4.x.
Notable changes in :mod:`asyncio` module since Python 3.4.0:
* A new debugging APIs: :meth:`loop.set_debug() <asyncio.BaseEventLoop.set_debug>`
- and :meth:`loop.get_debug() <asyncio.BaseEventLoop.get_debug>`.
+ and :meth:`loop.get_debug() <asyncio.BaseEventLoop.get_debug>` methods.
(Contributed by Victor Stinner.)
* The proactor event loop now supports SSL.
(Contributed by Antoine Pitrou and Victor Stinner in :issue:`22560`.)
-* A new :meth:`loop.is_closed() <asyncio.BaseEventLoop.is_closed>` to
+* A new :meth:`loop.is_closed() <asyncio.BaseEventLoop.is_closed>` method to
check if the event loop is closed.
(Contributed by Victor Stinner in :issue:`21326`.)
@@ -787,14 +787,14 @@ Notable changes in :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>`
- to customize the task factory that
+* 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:`Queue.join <asyncio.Queue.join>` and
- :meth:`Queue.task_done <asyncio.Queue.task_done>` queue methods.
+* New :meth:`Queue.join() <asyncio.Queue.join>` and
+ :meth:`Queue.task_done() <asyncio.Queue.task_done>` queue methods.
(Contributed by Victor Stinner.)
* The ``JoinableQueue`` class was removed, in favor of the