summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Klose <doko@ubuntu.com>2010-01-31 16:51:26 (GMT)
committerMatthias Klose <doko@ubuntu.com>2010-01-31 16:51:26 (GMT)
commit1665a8d9313660ffdcf3eda3eb1e1cc4eefcacee (patch)
treea969a080c8fe43c159762f36defbf202bf59a5de
parent70924dde0306fe97127ad52f68d2423fb9c977e9 (diff)
downloadcpython-1665a8d9313660ffdcf3eda3eb1e1cc4eefcacee.zip
cpython-1665a8d9313660ffdcf3eda3eb1e1cc4eefcacee.tar.gz
cpython-1665a8d9313660ffdcf3eda3eb1e1cc4eefcacee.tar.bz2
Merged revisions 77881 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r77881 | matthias.klose | 2010-01-31 17:48:44 +0100 (So, 31 Jan 2010) | 9 lines Merged revisions 77879 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77879 | matthias.klose | 2010-01-31 17:46:26 +0100 (So, 31 Jan 2010) | 2 lines - Fix typo in os.execvp docstring. ........ ................
-rw-r--r--Lib/os.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/os.py b/Lib/os.py
index 7c342fe..5b8aa25 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -322,7 +322,7 @@ def execlpe(file, *args):
execvpe(file, args[:-1], env)
def execvp(file, args):
- """execp(file, args)
+ """execvp(file, args)
Execute the executable file (which is searched for along $PATH)
with argument list args, replacing the current process.