diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-03-13 02:42:04 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-03-13 02:42:04 (GMT) |
| commit | 21317b654ed2e6ba131be02f08a99751a454bb99 (patch) | |
| tree | 8f9405cdd260957c6e5d7ac469664f5c2c3f54d4 | |
| parent | 10b93cc29cc98409ac45a94a44331b0bf6bfd666 (diff) | |
| download | cpython-21317b654ed2e6ba131be02f08a99751a454bb99.zip cpython-21317b654ed2e6ba131be02f08a99751a454bb99.tar.gz cpython-21317b654ed2e6ba131be02f08a99751a454bb99.tar.bz2 | |
merge 3.3 (#19060)
| -rw-r--r-- | Doc/library/subprocess.rst | 2 | ||||
| -rw-r--r-- | Lib/subprocess.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst index 95a85ce..d2893b6 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 e79e5fd..26d8de5 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* |