From: Matthias Klose <doko@ubuntu.com>
Date: Sun, 31 Jan 2010 16:48:44 +0000 (+0000)
Subject: Merged revisions 77879 via svnmerge from
X-Git-Tag: v3.2a1~1772
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a09c54f6578a37eab104c168543840fedf111ddd;p=thirdparty%2FPython%2Fcpython.git

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.
........
---

diff --git a/Lib/os.py b/Lib/os.py
index 2a9937f12f1c..a64098435317 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.