summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1993-10-22 14:26:06 (GMT)
committerGuido van Rossum <guido@python.org>1993-10-22 14:26:06 (GMT)
commit89b3325dc4d6999bb00068e048a76f7eba23a7a5 (patch)
treee424672e472142bf61273d896395960de6e5212f /Modules
parentb3b09c97ce0b40a282553b0366addc879a115eb4 (diff)
downloadcpython-89b3325dc4d6999bb00068e048a76f7eba23a7a5.zip
cpython-89b3325dc4d6999bb00068e048a76f7eba23a7a5.tar.gz
cpython-89b3325dc4d6999bb00068e048a76f7eba23a7a5.tar.bz2
* import.c (MAGIC): Changed magic word to avoid confusion about exec
function vs. exec statement * bltinmodule.c: renamed the module to __builtin__. * posixmodule.c (posix_execv): renamed exec --> execv since it is now a reserved word.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/posixmodule.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index d3f3583..df61c25 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -582,7 +582,7 @@ posix__exit(self, args)
/* XXX To do: exece, execp */
static object *
-posix_exec(self, args)
+posix_execv(self, args)
object *self;
object *args;
{
@@ -592,7 +592,7 @@ posix_exec(self, args)
int i, argc;
object *(*getitem) PROTO((object *, int));
- /* exec has two arguments: (path, argv), where
+ /* execv has two arguments: (path, argv), where
argv is a list or tuple of strings. */
if (!getargs(args, "(sO)", &path, &argv))
@@ -1180,7 +1180,7 @@ static struct methodlist posix_methods[] = {
#ifndef MSDOS
{"_exit", posix__exit},
- {"exec", posix_exec},
+ {"execv", posix_execv},
{"fork", posix_fork},
{"getegid", posix_getegid},
{"geteuid", posix_geteuid},