[Python-checkins] cpython (3.4): merge 3.3 (#19060)

[larry.hastings]

http://hg.python.org/cpython/rev/d2ad2e04dc9d
changeset:   89794:d2ad2e04dc9d
branch:      3.4
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Mar 12 21:42:04 2014 -0500
summary:
  merge 3.3 (#19060)

files:
  Doc/library/subprocess.rst |  2 +-
  Lib/subprocess.py          |  2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
--- 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
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -11,7 +11,7 @@
 
 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*

-- 
Repository URL: http://hg.python.org/cpython