summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2013-12-03 00:59:38 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2013-12-03 00:59:38 (GMT)
commit933a8c82ce1f156d35d9b902a1cf4ab5db04e68f (patch)
treee4b506fc4d3f3b077b0f38029421f9cb91cae4e6 /Doc
parent1ca5ba611b0458526fd12a23df4bfdf5a9e37a4d (diff)
downloadcpython-933a8c82ce1f156d35d9b902a1cf4ab5db04e68f.zip
cpython-933a8c82ce1f156d35d9b902a1cf4ab5db04e68f.tar.gz
cpython-933a8c82ce1f156d35d9b902a1cf4ab5db04e68f.tar.bz2
asyncio doc: reorder methods; typo
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/asyncio-protocol.rst26
-rw-r--r--Doc/library/asyncio-task.rst2
2 files changed, 14 insertions, 14 deletions
diff --git a/Doc/library/asyncio-protocol.rst b/Doc/library/asyncio-protocol.rst
index ae9c640..e3a5656 100644
--- a/Doc/library/asyncio-protocol.rst
+++ b/Doc/library/asyncio-protocol.rst
@@ -192,12 +192,6 @@ BaseSubprocessTransport
Return the subprocess process id as an integer.
- .. method:: get_returncode()
-
- Return the subprocess returncode as an integer or :const:`None`
- if it hasn't returned, similarly to the
- :attr:`subprocess.Popen.returncode` attribute.
-
.. method:: get_pipe_transport(fd)
Return the transport for the communication pipe correspondong to the
@@ -206,6 +200,19 @@ BaseSubprocessTransport
correspond to a pipe belonging to this transport, :const:`None` is
returned.
+ .. method:: get_returncode()
+
+ Return the subprocess returncode as an integer or :const:`None`
+ if it hasn't returned, similarly to the
+ :attr:`subprocess.Popen.returncode` attribute.
+
+ .. method:: kill(self)
+
+ Kill the subprocess, as in :meth:`subprocess.Popen.kill`
+
+ On POSIX systems, the function sends SIGKILL to the subprocess.
+ On Windows, this method is an alias for :meth:`terminate`.
+
.. method:: send_signal(signal)
Send the *signal* number to the subprocess, as in
@@ -220,13 +227,6 @@ BaseSubprocessTransport
On Windows, the Windows API function TerminateProcess() is called to
stop the subprocess.
- .. method:: kill(self)
-
- Kill the subprocess, as in :meth:`subprocess.Popen.kill`
-
- On POSIX systems, the function sends SIGKILL to the subprocess.
- On Windows, this method is an alias for :meth:`terminate`.
-
StreamWriter
------------
diff --git a/Doc/library/asyncio-task.rst b/Doc/library/asyncio-task.rst
index 9541438..e55f962 100644
--- a/Doc/library/asyncio-task.rst
+++ b/Doc/library/asyncio-task.rst
@@ -199,7 +199,7 @@ Task functions
or ``None``, there is no limit to the wait time.
*return_when* indicates when this function should return. It must be one of
- the following constants of the :mod`concurrent.futures` module:
+ the following constants of the :mod:`concurrent.futures` module:
.. tabularcolumns:: |l|L|