mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

* import.c (MAGIC): Changed magic word to avoid confusion about exec

Browse source 
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.
This commit is contained in:
Guido van Rossum 1993-10-22 14:26:06 +00:00
parent b3b09c97ce
commit 89b3325dc4
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Modules/posixmodule.c
View file

@ -582,7 +582,7 @@ posix__exit(self, args)
/* XXX To do: exece, execp */ /* XXX To do: exece, execp */
static object * static object *
posix_exec(self, args) posix_execv(self, args)
object *self; object *self;
object *args; object *args;
{ {
@ -592,7 +592,7 @@ posix_exec(self, args)
int i, argc; int i, argc;
object *(*getitem) PROTO((object *, int)); 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. */ argv is a list or tuple of strings. */
if (!getargs(args, "(sO)", &path, &argv)) if (!getargs(args, "(sO)", &path, &argv))
@ -1180,7 +1180,7 @@ static struct methodlist posix_methods[] = {
#ifndef MSDOS #ifndef MSDOS
{"_exit", posix__exit}, {"_exit", posix__exit},
{"exec", posix_exec}, {"execv", posix_execv},
{"fork", posix_fork}, {"fork", posix_fork},
{"getegid", posix_getegid}, {"getegid", posix_getegid},
{"geteuid", posix_geteuid}, {"geteuid", posix_geteuid},

2
Python/bltinmodule.c
View file

@ -844,7 +844,7 @@ void
initbuiltin() initbuiltin()
{ {
object *m; object *m;
m = initmodule("builtin", builtin_methods); m = initmodule("__builtin__", builtin_methods);
builtin_dict = getmoduledict(m); builtin_dict = getmoduledict(m);
INCREF(builtin_dict); INCREF(builtin_dict);
initerrors(); initerrors();

2
Python/import.c
View file

@ -61,7 +61,7 @@ extern char *argv0;
/* Magic word to reject .pyc files generated by other Python versions */ /* 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; static object *modules;