summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorCarol Willing <carolcode@willingconsulting.com>2018-09-13 23:14:41 (GMT)
committerYury Selivanov <yury@magic.io>2018-09-13 23:14:41 (GMT)
commita3c8ba723530ceb3328d184d3e0020534b522778 (patch)
treef663ea40280e380025065208ad9631932c053038 /Doc
parent01e0afa994c2e840f85e2de103e72a2c0ddf1b1f (diff)
downloadcpython-a3c8ba723530ceb3328d184d3e0020534b522778.zip
cpython-a3c8ba723530ceb3328d184d3e0020534b522778.tar.gz
cpython-a3c8ba723530ceb3328d184d3e0020534b522778.tar.bz2
polish exceptions and platforms (GH-9272)
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/asyncio-exceptions.rst5
-rw-r--r--Doc/library/asyncio-platforms.rst9
2 files changed, 8 insertions, 6 deletions
diff --git a/Doc/library/asyncio-exceptions.rst b/Doc/library/asyncio-exceptions.rst
index bcd3599..7f3ed85 100644
--- a/Doc/library/asyncio-exceptions.rst
+++ b/Doc/library/asyncio-exceptions.rst
@@ -19,11 +19,12 @@ Exceptions
The operation has been cancelled.
- This exception can be caught to perform custom operations on
+ This exception can be caught to perform custom operations
when asyncio Tasks are cancelled. In almost all situations the
exception must always be re-raised.
.. note::
+
This exception is a subclass of :exc:`Exception`, so it can be
accidentally suppressed by ``try..except`` block::
@@ -54,7 +55,7 @@ Exceptions
.. exception:: SendfileNotAvailableError
- The "sendfile" syscall for is not available for the given
+ The "sendfile" syscall is not available for the given
socket or file type.
A subclass of :exc:`RuntimeError`.
diff --git a/Doc/library/asyncio-platforms.rst b/Doc/library/asyncio-platforms.rst
index afdbce6..2f0f534 100644
--- a/Doc/library/asyncio-platforms.rst
+++ b/Doc/library/asyncio-platforms.rst
@@ -9,7 +9,8 @@ Platforms Support
=================
The :mod:`asyncio` module has been designed to be portable,
-but some platforms have subtle differences and limitations.
+but some platforms have subtle differences and limitations
+due to the platforms' underlying architecture and capabilities.
All Platforms
@@ -26,7 +27,7 @@ All event loops on Windows do not support the following methods:
* :meth:`loop.create_unix_connection` and
:meth:`loop.create_unix_server` are not supported.
- The :data:`socket.AF_UNIX` socket family is specific to UNIX/
+ The :data:`socket.AF_UNIX` socket family is specific to UNIX.
* :meth:`loop.add_signal_handler` and
:meth:`loop.remove_signal_handler` are not supported.
@@ -66,8 +67,8 @@ Windows configuration.
Subprocess Support on Windows
-----------------------------
-:class:`SelectorEventLoop` on Windows does not support subproceses,
-so :class:`ProactorEventLoop` should be used instead::
+:class:`SelectorEventLoop` on Windows does not support subproceses.
+On Windows, :class:`ProactorEventLoop` should be used instead::
import asyncio