Index: Python/pythonrun.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/pythonrun.c,v
retrieving revision 2.148
diff -c -4 -r2.148 pythonrun.c
*** Python/pythonrun.c	2001/08/31 17:40:15	2.148
--- Python/pythonrun.c	2001/10/03 09:44:06
***************
*** 86,93 ****
--- 86,101 ----
     having the lock, but you cannot use multiple threads.)
  
  */
  
+ static int add_flag(int flag,const char *envs)
+ {
+     int env=atoi(envs);
+     if(flag<env) flag = env;
+     if(flag<1) flag = 1;
+     return flag;
+ }
+ 
  void
  Py_Initialize(void)
  {
  	PyInterpreterState *interp;
***************
*** 100,112 ****
  		return;
  	initialized = 1;
  	
  	if ((p = Py_GETENV("PYTHONDEBUG")) && *p != '\0')
! 		Py_DebugFlag = Py_DebugFlag ? Py_DebugFlag : 1;
  	if ((p = Py_GETENV("PYTHONVERBOSE")) && *p != '\0')
! 		Py_VerboseFlag = Py_VerboseFlag ? Py_VerboseFlag : 1;
  	if ((p = Py_GETENV("PYTHONOPTIMIZE")) && *p != '\0')
! 		Py_OptimizeFlag = Py_OptimizeFlag ? Py_OptimizeFlag : 1;
  
  	interp = PyInterpreterState_New();
  	if (interp == NULL)
  		Py_FatalError("Py_Initialize: can't make first interpreter");
--- 108,120 ----
  		return;
  	initialized = 1;
  	
  	if ((p = Py_GETENV("PYTHONDEBUG")) && *p != '\0')
! 		Py_DebugFlag = add_flag(Py_DebugFlag,p);
  	if ((p = Py_GETENV("PYTHONVERBOSE")) && *p != '\0')
! 		Py_VerboseFlag = add_flag(Py_VerboseFlag,p);
  	if ((p = Py_GETENV("PYTHONOPTIMIZE")) && *p != '\0')
! 		Py_OptimizeFlag = add_flag(Py_OptimizeFlag,p);
  
  	interp = PyInterpreterState_New();
  	if (interp == NULL)
  		Py_FatalError("Py_Initialize: can't make first interpreter");
Index: Misc/python.man
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/python.man,v
retrieving revision 1.22
diff -c -4 -r1.22 python.man
*** Misc/python.man	2001/09/05 18:57:51	1.22
--- Misc/python.man	2001/10/03 09:44:02
***************
*** 338,357 ****
  Set this to a non-empty string to cause the \fItime\fP module to
  require dates specified as strings to include 4-digit years, otherwise
  2-digit years are converted based on rules described in the \fItime\fP
  module documnetation.
  .IP PYTHONDEBUG
  If this is set to a non-empty string it is equivalent to specifying
! the \fB\-d\fP option.
  .IP PYTHONINSPECT
  If this is set to a non-empty string it is equivalent to specifying
  the \fB\-i\fP option.
  .IP PYTHONUNBUFFERED
  If this is set to a non-empty string it is equivalent to specifying
  the \fB\-u\fP option.
  .IP PYTHONVERBOSE
  If this is set to a non-empty string it is equivalent to specifying
! the \fB\-v\fP option.
  .SH AUTHOR
  .nf
  Guido van Rossum
  .PP
--- 338,363 ----
  Set this to a non-empty string to cause the \fItime\fP module to
  require dates specified as strings to include 4-digit years, otherwise
  2-digit years are converted based on rules described in the \fItime\fP
  module documnetation.
+ .IP PYTHONOPTIMIZE
+ If this is set to a non-empty string it is equivalent to specifying
+ the \fB\-O\fP option. If set to an integer, it is equivalent to
+ specifying \fB\-O\fP multiple times.
  .IP PYTHONDEBUG
  If this is set to a non-empty string it is equivalent to specifying
! the \fB\-d\fP option. If set to an integer, it is equivalent to
! specifying \fB\-d\fP multiple times.
  .IP PYTHONINSPECT
  If this is set to a non-empty string it is equivalent to specifying
  the \fB\-i\fP option.
  .IP PYTHONUNBUFFERED
  If this is set to a non-empty string it is equivalent to specifying
  the \fB\-u\fP option.
  .IP PYTHONVERBOSE
  If this is set to a non-empty string it is equivalent to specifying
! the \fB\-v\fP option. If set to an integer, it is equivalent to
! specifying \fB\-v\fP multiple times. 
  .SH AUTHOR
  .nf
  Guido van Rossum
  .PP