bpo-36760: Clarify subprocess capture_output docs. (GH-13322) · python/cpython@e883091 (original) (raw)

Original file line number	Diff line number	Diff line change
@@ -55,7 +55,9 @@ compatibility with older versions, see the :ref:`call-function-trio` section.
55	55	If capture_output is true, stdout and stderr will be captured.
56	56	When used, the internal :class:`Popen` object is automatically created with
57	57	``stdout=PIPE`` and ``stderr=PIPE``. The stdout and stderr arguments may
58		- not be supplied at the same time as capture_output.
	58	+ not be supplied at the same time as capture_output. If you wish to capture
	59	+ and combine both streams into one, use ``stdout=PIPE`` and ``stderr=STDOUT``
	60	+ instead of capture_output.
59	61
60	62	The timeout argument is passed to :meth:`Popen.communicate`. If the timeout
61	63	expires, the child process will be killed and waited for. The