changeset: 77036:2034b3de1144
user: Antoine Pitrou <solipsis@pitrou.net>
date: Fri May 18 18:33:07 2012 +0200
files: Lib/multiprocessing/util.py Lib/subprocess.py Lib/test/support.py Tools/scripts/run_tests.py
description:
Move private function _args_from_interpreter_flags() to subprocess.py, so
that it can be imported when threads are disabled.
(followup to issue #12098)
diff -r 347735ec92eb -r 2034b3de1144 Lib/multiprocessing/util.py
--- a/Lib/multiprocessing/util.py	Fri May 18 14:28:02 2012 +0100
+++ b/Lib/multiprocessing/util.py	Fri May 18 18:33:07 2012 +0200
@@ -14,6 +14,7 @@
 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 @@
 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
diff -r 347735ec92eb -r 2034b3de1144 Lib/subprocess.py
--- a/Lib/subprocess.py	Fri May 18 14:28:02 2012 +0100
+++ b/Lib/subprocess.py	Fri May 18 18:33:07 2012 +0200
@@ -475,6 +475,37 @@
 continue
 
 
+# XXX This function is only used by multiprocessing and the test suite,
+# but it's here so that it can be imported when Python is compiled without
+# threads.
+
+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
+
+
 def call(*popenargs, timeout=None, **kwargs):
 """Run command with arguments. Wait for command to complete or
 timeout, then return the returncode attribute.
diff -r 347735ec92eb -r 2034b3de1144 Lib/test/support.py
--- a/Lib/test/support.py	Fri May 18 14:28:02 2012 +0100
+++ b/Lib/test/support.py	Fri May 18 18:33:07 2012 +0200
@@ -1596,8 +1596,7 @@
 def args_from_interpreter_flags():
 """Return a list of command-line arguments reproducing the current
 settings in sys.flags and sys.warnoptions."""
- from multiprocessing.util import _args_from_interpreter_flags
- return _args_from_interpreter_flags()
+ return subprocess._args_from_interpreter_flags()
 
 #============================================================
 # Support for assertions about logging.
diff -r 347735ec92eb -r 2034b3de1144 Tools/scripts/run_tests.py
--- a/Tools/scripts/run_tests.py	Fri May 18 14:28:02 2012 +0100
+++ b/Tools/scripts/run_tests.py	Fri May 18 18:33:07 2012 +0200
@@ -10,6 +10,10 @@
 import os
 import sys
 import test.support
+try:
+ import threading
+except ImportError:
+ threading = None
 
 
 def is_multiprocess_flag(arg):
@@ -34,7 +38,7 @@
 ])
 if sys.platform == 'win32':
 args.append('-n') # Silence alerts under Windows
- if not any(is_multiprocess_flag(arg) for arg in regrtest_args):
+ if threading and not any(is_multiprocess_flag(arg) for arg in regrtest_args):
 args.extend(['-j', '0']) # Use all CPU cores
 if not any(is_resource_use_flag(arg) for arg in regrtest_args):
 args.extend(['-u', 'all,-largefile,-audio,-gui'])
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://hg.python.org/cpython/rev/2034b3de1144">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/2034b3de1144" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>