Commit cfd155e5 authored by Éric Araujo's avatar Éric Araujo

Merge heads

parents b0b07a00 cfa8982b
...@@ -497,6 +497,6 @@ TCP echo server example, send back received data and close the connection:: ...@@ -497,6 +497,6 @@ TCP echo server example, send back received data and close the connection::
:meth:`Transport.close` can be called immediately after :meth:`Transport.close` can be called immediately after
:meth:`WriteTransport.write` even if data are not sent yet on the socket: both :meth:`WriteTransport.write` even if data are not sent yet on the socket: both
methods are asynchronous. ``yield from`` is not needed because these transport methods are asynchronous. ``yield from`` is not needed because these transport
methods don't return coroutines. methods are not coroutines.
...@@ -11,13 +11,13 @@ Create a subprocess ...@@ -11,13 +11,13 @@ Create a subprocess
Run the shell command *cmd* given as a string. Return a :class:`~asyncio.subprocess.Process` Run the shell command *cmd* given as a string. Return a :class:`~asyncio.subprocess.Process`
instance. instance.
This function returns a :ref:`coroutine object <coroutine>`. This function is a :ref:`coroutine <coroutine>`.
.. function:: create_subprocess_exec(\*args, stdin=None, stdout=None, stderr=None, loop=None, limit=None, \*\*kwds) .. function:: create_subprocess_exec(\*args, stdin=None, stdout=None, stderr=None, loop=None, limit=None, \*\*kwds)
Create a subprocess. Return a :class:`~asyncio.subprocess.Process` instance. Create a subprocess. Return a :class:`~asyncio.subprocess.Process` instance.
This function returns a :ref:`coroutine object <coroutine>`. This function is a :ref:`coroutine <coroutine>`.
Use the :meth:`BaseEventLoop.connect_read_pipe` and Use the :meth:`BaseEventLoop.connect_read_pipe` and
:meth:`BaseEventLoop.connect_write_pipe` methods to connect pipes. :meth:`BaseEventLoop.connect_write_pipe` methods to connect pipes.
......
...@@ -73,7 +73,7 @@ Lock ...@@ -73,7 +73,7 @@ Lock
This method blocks until the lock is unlocked, then sets it to locked and This method blocks until the lock is unlocked, then sets it to locked and
returns ``True``. returns ``True``.
This method returns a :ref:`coroutine object <coroutine>`. This method is a :ref:`coroutine <coroutine>`.
.. method:: release() .. method:: release()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment