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

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index d3f35837b15fd0c5a572dc45776a73e67c149619..df61c25e3b00bcf3b0022413a8ff0ac1b53eb777 100644 (file)
--- 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},

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 3ba8f91c0b592399de6164ce55583d59532f1739..60208a0d47c49f01e6dd5e5c6766d1ca692c79c3 100644 (file)
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -844,7 +844,7 @@ void
 initbuiltin()
 {
        object *m;
-       m = initmodule("builtin", builtin_methods);
+       m = initmodule("__builtin__", builtin_methods);
        builtin_dict = getmoduledict(m);
        INCREF(builtin_dict);
        initerrors();

diff --git a/Python/import.c b/Python/import.c
index 4d01daf7a22f88d6017397f628f42f59b8d83a65..f0d4828ea0177e6ed36cfd1a192763c05c283353 100644 (file)
--- a/Python/import.c
+++ b/Python/import.c
@@ -61,7 +61,7 @@ extern char *argv0;
 
 /* Magic word to reject .pyc files generated by other Python versions */
 
-#define MAGIC 0x999901L /* Increment by one for each incompatible change */
+#define MAGIC 0x999902L /* Increment by one for each incompatible change */
 
 static object *modules;