traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tracking changes to Py_Main(): 

- Got rid of inspection of some environment variables.

- Got rid of Py_GetProgramName() and related logic.

- Print the version header *after* successful initialization.
This commit is contained in:
Guido van Rossum 1997-07-19 19:24:41 +00:00
parent ed52aacb33
commit 3768fb1097
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Python/frozenmain.c
View File

@ -37,9 +37,6 @@ PERFORMANCE OF THIS SOFTWARE.
extern char *Py_GetVersion(); extern char *Py_GetVersion();
extern char *Py_GetCopyright(); extern char *Py_GetCopyright();
/* For Py_GetProgramName(); set by main() */
static char *argv0;
/* Main program */ /* Main program */
int int
@ -52,14 +49,6 @@ main(argc, argv)
int inspect = 0; int inspect = 0;
int unbuffered = 0; int unbuffered = 0;
argv0 = argv[0];
if ((p = getenv("PYTHONDEBUG")) && *p != '\0')
Py_DebugFlag = 1;
if ((p = getenv("PYTHONSUPPRESS")) && *p != '\0')
Py_SuppressPrintingFlag = 1;
if ((p = getenv("PYTHONVERBOSE")) && *p != '\0')
Py_VerboseFlag = 1;
if ((p = getenv("PYTHONINSPECT")) && *p != '\0') if ((p = getenv("PYTHONINSPECT")) && *p != '\0')
inspect = 1; inspect = 1;
if ((p = getenv("PYTHONUNBUFFERED")) && *p != '\0') if ((p = getenv("PYTHONUNBUFFERED")) && *p != '\0')
@ -70,10 +59,13 @@ main(argc, argv)
setbuf(stderr, (char *)NULL); setbuf(stderr, (char *)NULL);
} }
Py_SetProgramName(argv[0]);
Py_Initialize();
if (Py_VerboseFlag) if (Py_VerboseFlag)
fprintf(stderr, "Python %s\n%s\n", fprintf(stderr, "Python %s\n%s\n",
Py_GetVersion(), Py_GetCopyright()); Py_GetVersion(), Py_GetCopyright());
Py_Initialize();
PySys_SetArgv(argc, argv); PySys_SetArgv(argc, argv);
n = PyImport_ImportFrozenModule("__main__"); n = PyImport_ImportFrozenModule("__main__");
@ -92,9 +84,3 @@ main(argc, argv)
Py_Exit(sts); Py_Exit(sts);
/*NOTREACHED*/ /*NOTREACHED*/
} }
char *
Py_GetProgramName()
{
return argv0;
}