Patch #695250: Suppress COPYRIGHT if site.py is not read. Fixes #672614.

Will backport to 2.2.
This commit is contained in:
Martin v. Löwis 2003-03-30 17:00:39 +00:00
parent 24b8881f61
commit e98922fb80
1 changed files with 6 additions and 3 deletions

View File

@ -370,9 +370,12 @@ Py_Main(int argc, char **argv)
Py_Initialize();
if (Py_VerboseFlag ||
(command == NULL && filename == NULL && stdin_is_interactive))
fprintf(stderr, "Python %s on %s\n%s\n",
Py_GetVersion(), Py_GetPlatform(), COPYRIGHT);
(command == NULL && filename == NULL && stdin_is_interactive)) {
fprintf(stderr, "Python %s on %s\n",
Py_GetVersion(), Py_GetPlatform());
if (!Py_NoSiteFlag)
fprintf(stderr, "%s\n", COPYRIGHT);
}
if (command != NULL) {
/* Backup _PyOS_optind and force sys.argv[0] = '-c' */