[Python-checkins] r79190 - in python/branches/release26-maint: Lib/test/test_os.py Misc/NEWS Modules/posixmodule.c

[matthias.klose]

Author: matthias.klose
Date: Sun Mar 21 12:15:45 2010
New Revision: 79190

Log:
Revert r79131

  - Issue #1039, #8154: Fix os.execlp() crash with missing 2nd argument.


Modified:
   python/branches/release26-maint/Lib/test/test_os.py
   python/branches/release26-maint/Misc/NEWS
   python/branches/release26-maint/Modules/posixmodule.c

Modified: python/branches/release26-maint/Lib/test/test_os.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_os.py	(original)
+++ python/branches/release26-maint/Lib/test/test_os.py	Sun Mar 21 12:15:45 2010
@@ -511,9 +511,6 @@
         except NotImplementedError:
             pass
 
-    def test_execvpe_with_bad_arglist(self):
-        self.assertRaises(ValueError, os.execvpe, 'notepad', [], None)
-
 class Win32ErrorTests(unittest.TestCase):
     def test_rename(self):
         self.assertRaises(WindowsError, os.rename, test_support.TESTFN, test_support.TESTFN+".bak")

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Sun Mar 21 12:15:45 2010
@@ -15,8 +15,6 @@
 Library
 -------
 
-- Issue #1039, #8154: Fix os.execlp() crash with missing 2nd argument.
-
 - Issue #4961: Inconsistent/wrong result of askyesno function in tkMessageBox
   with Tcl/Tk-8.5.
 

Modified: python/branches/release26-maint/Modules/posixmodule.c
==============================================================================
--- python/branches/release26-maint/Modules/posixmodule.c	(original)
+++ python/branches/release26-maint/Modules/posixmodule.c	Sun Mar 21 12:15:45 2010
@@ -2979,11 +2979,6 @@
                 PyMem_Free(path);
 		return NULL;
 	}
-	if (argc < 1) {
-		PyErr_SetString(PyExc_ValueError, "execv() arg 2 must not be empty");
-                PyMem_Free(path);
-		return NULL;
-	}
 
 	argvlist = PyMem_NEW(char *, argc+1);
 	if (argvlist == NULL) {