diff options
| -rw-r--r-- | Misc/python.man | 10 | ||||
| -rw-r--r-- | Python/pythonrun.c | 17 |
2 files changed, 22 insertions, 5 deletions
diff --git a/Misc/python.man b/Misc/python.man index 6723e13..609c2ca 100644 --- a/Misc/python.man +++ b/Misc/python.man @@ -339,9 +339,14 @@ 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. +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. @@ -350,7 +355,8 @@ 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. +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 diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 8dd9c14..963df8a 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -87,6 +87,17 @@ Py_IsInitialized(void) */ +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) { @@ -101,11 +112,11 @@ Py_Initialize(void) initialized = 1; if ((p = Py_GETENV("PYTHONDEBUG")) && *p != '\0') - Py_DebugFlag = Py_DebugFlag ? Py_DebugFlag : 1; + Py_DebugFlag = add_flag(Py_DebugFlag, p); if ((p = Py_GETENV("PYTHONVERBOSE")) && *p != '\0') - Py_VerboseFlag = Py_VerboseFlag ? Py_VerboseFlag : 1; + Py_VerboseFlag = add_flag(Py_VerboseFlag, p); if ((p = Py_GETENV("PYTHONOPTIMIZE")) && *p != '\0') - Py_OptimizeFlag = Py_OptimizeFlag ? Py_OptimizeFlag : 1; + Py_OptimizeFlag = add_flag(Py_OptimizeFlag, p); interp = PyInterpreterState_New(); if (interp == NULL) |