Merged revisions 76640 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76640 | philip.jenvey | 2009-12-02 18:25:54 -0800 (Wed, 02 Dec 2009) | 2 lines

  #7177: clarify the potential PIPE deadlock warnings
........

diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
index 524161e82babf274153c292a230d6ed73adbe7ea..93ad19c8f16cc0c0d939901042d26298bb268f18 100644 (file)
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -161,9 +161,10 @@ This module also defines four shortcut functions:
 
    .. warning::
 
-      Like :meth:`Popen.wait`, this will deadlock if the child process
-      generates enough output to a stdout or stderr pipe such that it blocks
-      waiting for the OS pipe buffer to accept more data.
+      Like :meth:`Popen.wait`, this will deadlock when using
+      ``stdout=PIPE`` and/or ``stderr=PIPE`` and the child process
+      generates enough output to a pipe such that it blocks waiting
+      for the OS pipe buffer to accept more data.
 
 
 .. function:: check_call(*popenargs, **kwargs)
@@ -286,9 +287,10 @@ Instances of the :class:`Popen` class have the following methods:
 
    .. warning::
 
-      This will deadlock if the child process generates enough output to a
-      stdout or stderr pipe such that it blocks waiting for the OS pipe buffer
-      to accept more data.  Use :meth:`communicate` to avoid that.
+      This will deadlock when using ``stdout=PIPE`` and/or
+      ``stderr=PIPE`` and the child process generates enough output to
+      a pipe such that it blocks waiting for the OS pipe buffer to
+      accept more data.  Use :meth:`communicate` to avoid that.
 
 
 .. method:: Popen.communicate(input=None)