[Python-checkins] cpython (merge default -> default): Merge heads

Mon Feb 24 14:00:13 CET 2014

http://hg.python.org/cpython/rev/562ed304b30e
changeset: 89367:562ed304b30e
parent: 89366:559ced4bb682
parent: 89364:768013d59a70
user: Serhiy Storchaka <storchaka at gmail.com>
date: Mon Feb 24 14:57:35 2014 +0200
summary:
 Merge heads
files:
 Doc/library/asyncio-subprocess.rst | 4 ++--
 Doc/library/subprocess.rst | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Doc/library/asyncio-subprocess.rst b/Doc/library/asyncio-subprocess.rst
--- a/Doc/library/asyncio-subprocess.rst
+++ b/Doc/library/asyncio-subprocess.rst
@@ -8,14 +8,14 @@
 
 .. function:: create_subprocess_shell(cmd, stdin=None, stdout=None, stderr=None, loop=None, limit=None, \*\*kwds)
 
- Run the shell command *cmd* given as a string. Return a :class:`Process`
+ Run the shell command *cmd* given as a string. Return a :class:`~asyncio.subprocess.Process`
 instance.
 
 This function returns a :ref:`coroutine object <coroutine>`.
 
 .. function:: create_subprocess_exec(\*args, stdin=None, stdout=None, stderr=None, loop=None, limit=None, \*\*kwds)
 
- Create a subprocess. Return a :class:`Process` instance.
+ Create a subprocess. Return a :class:`~asyncio.subprocess.Process` instance.
 
 This function returns a :ref:`coroutine object <coroutine>`.
 
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -629,6 +629,12 @@
 :exc:`TimeoutExpired` exception. It is safe to catch this exception and
 retry the wait.
 
+ .. note::
+
+ The function is implemented using a busy loop (non-blocking call and
+ short sleeps). Use the :mod:`asyncio` module for an asynchronous wait:
+ see :class:`asyncio.create_subprocess_exec`.
+
 .. warning::
 
 This will deadlock when using ``stdout=PIPE`` and/or
-- 
Repository URL: http://hg.python.org/cpython
