[Python-checkins] r77882 - python/branches/release31-maint/Lib/os.py

[matthias.klose]

Author: matthias.klose
Date: Sun Jan 31 17:51:26 2010
New Revision: 77882

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


Modified:
   python/branches/release31-maint/Lib/os.py

Modified: python/branches/release31-maint/Lib/os.py
==============================================================================
--- python/branches/release31-maint/Lib/os.py	(original)
+++ python/branches/release31-maint/Lib/os.py	Sun Jan 31 17:51:26 2010
@@ -322,7 +322,7 @@
     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.