From: Benjamin Peterson Date: Thu, 13 Mar 2014 02:42:04 +0000 (-0500) Subject: merge 3.3 (#19060) X-Git-Tag: v3.4.0~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=21317b654ed2e6ba131be02f08a99751a454bb99;p=thirdparty%2FPython%2Fcpython.git merge 3.3 (#19060) --- diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst index 95a85cefdd2e..d2893b652629 100644 --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -9,7 +9,7 @@ The :mod:`subprocess` module allows you to spawn new processes, connect to their input/output/error pipes, and obtain their return codes. This module intends to -replace several other, older modules and functions, such as:: +replace several older modules and functions:: os.system os.spawn* diff --git a/Lib/subprocess.py b/Lib/subprocess.py index e79e5fd614b8..26d8de5beb8c 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -11,7 +11,7 @@ r"""subprocess - Subprocesses with accessible I/O streams This module allows you to spawn processes, connect to their input/output/error pipes, and obtain their return codes. This module -intends to replace several other, older modules and functions, like: +intends to replace several older modules and functions: os.system os.spawn*