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 | 605765fa32f994778ae7d6c48945299228f111e5 (patch) | |
| tree | 86c37a86ed43a03e97afbf831939a64367f0a49d | |
| parent | abdc16ee1bb9819ecc6500a8f1d8720fc2072643 (diff) | |
| parent | 5eea8a7780164b92bf72f8c81c4a00915a5d714e (diff) | |
| download | cpython-605765fa32f994778ae7d6c48945299228f111e5.zip cpython-605765fa32f994778ae7d6c48945299228f111e5.tar.gz cpython-605765fa32f994778ae7d6c48945299228f111e5.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 d4caf22..cdcbe82 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 921670d..d629bdf 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* |