summaryrefslogtreecommitdiff
path: root/Doc/library/subprocess.rst
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2017-02-04 09:19:04 +0300
committerBerker Peksag <berker.peksag@gmail.com>2017-02-04 09:19:04 +0300
commitb53991455f7f258ede7a26b69c2be5b8138b9f8a (patch)
tree3615cf0ef453ab113a547b1dfebacf415ed32602 /Doc/library/subprocess.rst
parent678487eb345f9f9dea3d3818ecad7d39145bdc65 (diff)
parent9bfb9694a65124a8191cdb8ce7992445d1d0f4d2 (diff)
downloadcpython-b53991455f7f258ede7a26b69c2be5b8138b9f8a.tar.gz
Issue #29198: Merge from 3.6
Diffstat (limited to 'Doc/library/subprocess.rst')
-rw-r--r--Doc/library/subprocess.rst6
1 files changed, 0 insertions, 6 deletions
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
index ad2abe8245..ea065b897e 100644
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -608,12 +608,6 @@ Instances of the :class:`Popen` class have the following methods:
.. versionchanged:: 3.3
*timeout* was added.
- .. deprecated:: 3.4
-
- Do not use the *endtime* parameter. It is was unintentionally
- exposed in 3.3 but was left undocumented as it was intended to be
- private for internal use. Use *timeout* instead.
-
.. method:: Popen.communicate(input=None, timeout=None)
Interact with process: Send data to stdin. Read data from stdout and stderr,