Move private function _args_from_interpreter_flags() to subprocess.py, so

that it can be imported when threads are disabled.
(followup to issue #12098)
This commit is contained in:
Antoine Pitrou 2012-05-18 18:33:07 +02:00
parent 77c84f2def
commit ebdcd859e5
4 changed files with 38 additions and 32 deletions

View file

@ -14,6 +14,7 @@ import weakref
import atexit
import threading # we want threading to install it's
# cleanup function before multiprocessing does
from subprocess import _args_from_interpreter_flags
from multiprocessing.process import current_process, active_children
@ -297,32 +298,3 @@ class ForkAwareLocal(threading.local):
def __reduce__(self):
return type(self), ()
#
# Get options for python to produce the same sys.flags
#
def _args_from_interpreter_flags():
"""Return a list of command-line arguments reproducing the current
settings in sys.flags and sys.warnoptions."""
flag_opt_map = {
'debug': 'd',
# 'inspect': 'i',
# 'interactive': 'i',
'optimize': 'O',
'dont_write_bytecode': 'B',
'no_user_site': 's',
'no_site': 'S',
'ignore_environment': 'E',
'verbose': 'v',
'bytes_warning': 'b',
'quiet': 'q',
'hash_randomization': 'R',
}
args = []
for flag, opt in flag_opt_map.items():
v = getattr(sys.flags, flag)
if v > 0:
args.append('-' + opt * v)
for opt in sys.warnoptions:
args.append('-W' + opt)
return args