summaryrefslogtreecommitdiffstats
path: root/Lib/subprocess.py
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2009-02-21 20:59:32 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2009-02-21 20:59:32 (GMT)
commit934896dc0977ea25dc37c13117525f2394625cee (patch)
treef4671cebdd730ba732dcae5185548dd35b9ffa72 /Lib/subprocess.py
parent91cf882b367644ece7f121cd22fc43c2f439a2d5 (diff)
downloadcpython-934896dc0977ea25dc37c13117525f2394625cee.zip
cpython-934896dc0977ea25dc37c13117525f2394625cee.tar.gz
cpython-934896dc0977ea25dc37c13117525f2394625cee.tar.bz2
Merged revisions 69846 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r69846 | mark.dickinson | 2009-02-21 20:27:01 +0000 (Sat, 21 Feb 2009) | 2 lines Issue #5341: Fix a variety of spelling errors. ........
Diffstat (limited to 'Lib/subprocess.py')
-rw-r--r--Lib/subprocess.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index bd158f6..c461b25 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -446,9 +446,9 @@ def check_output(*popenargs, **kwargs):
To capture standard error in the result, use stderr=subprocess.STDOUT.
>>> check_output(["/bin/sh", "-c",
- "ls -l non_existant_file ; exit 0"],
+ "ls -l non_existent_file ; exit 0"],
stderr=subprocess.STDOUT)
- 'ls: non_existant_file: No such file or directory\n'
+ 'ls: non_existent_file: No such file or directory\n'
"""
if 'stdout' in kwargs:
raise ValueError('stdout argument not allowed, it will be overridden.')
@@ -850,7 +850,7 @@ class Popen(object):
# cause random failures on win9x. Specifically a
# dialog: "Your program accessed mem currently in
# use at xxx" and a hopeful warning about the
- # stability of your system. Cost is Ctrl+C wont
+ # stability of your system. Cost is Ctrl+C won't
# kill children.
creationflags |= CREATE_NEW_CONSOLE