diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2014-10-13 22:53:13 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2014-10-13 22:53:13 (GMT) |
| commit | 395c73436e279f53930ce66d682600d327f4e3c8 (patch) | |
| tree | d674ab3eaf00b1510477f0610fe15eab03ad1f8a /Doc/library/subprocess.rst | |
| parent | 0d6f9a0465bca2abb799225966271bf6cdf6490f (diff) | |
| parent | 39892055cdd560c9ddb895bfd2b82c3c31329218 (diff) | |
| download | cpython-395c73436e279f53930ce66d682600d327f4e3c8.zip cpython-395c73436e279f53930ce66d682600d327f4e3c8.tar.gz cpython-395c73436e279f53930ce66d682600d327f4e3c8.tar.bz2 | |
Merge 3.4 (asyncio doc)
Diffstat (limited to 'Doc/library/subprocess.rst')
| -rw-r--r-- | Doc/library/subprocess.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst index 6e495b3..49a82bd 100644 --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -634,7 +634,7 @@ Instances of the :class:`Popen` class have the following methods: ``None``, if no data should be sent to the child. The type of *input* must be bytes or, if *universal_newlines* was ``True``, a string. - :meth:`communicate` returns a tuple ``(stdoutdata, stderrdata)``. + :meth:`communicate` returns a tuple ``(stdout_data, stderr_data)``. The data will be bytes or, if *universal_newlines* was ``True``, strings. Note that if you want to send data to the process's stdin, you need to create |