summaryrefslogtreecommitdiffstats
path: root/Lib/test/support.py
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2011-03-15 20:04:54 (GMT)
committerGregory P. Smith <greg@krypto.org>2011-03-15 20:04:54 (GMT)
commitd3967d4ccaf50576b8d8976701ed52245d1a77d0 (patch)
tree3981d3a7502987e63d01a8fe7f3f36e09aa1abdf /Lib/test/support.py
parent31a248bdedd7bf6b224ebb890248d749cd6de564 (diff)
parent71f1363c349c6ccab38870d328cee4de9081c8f9 (diff)
downloadcpython-d3967d4ccaf50576b8d8976701ed52245d1a77d0.zip
cpython-d3967d4ccaf50576b8d8976701ed52245d1a77d0.tar.gz
cpython-d3967d4ccaf50576b8d8976701ed52245d1a77d0.tar.bz2
merge head
Diffstat (limited to 'Lib/test/support.py')
-rw-r--r--Lib/test/support.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/support.py b/Lib/test/support.py
index 53c2956..f5a53ca 100644
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -1374,7 +1374,7 @@ def strip_python_stderr(stderr):
def args_from_interpreter_flags():
"""Return a list of command-line arguments reproducing the current
- settings in sys.flags."""
+ settings in sys.flags and sys.warnoptions."""
flag_opt_map = {
'bytes_warning': 'b',
'dont_write_bytecode': 'B',
@@ -1389,6 +1389,9 @@ def args_from_interpreter_flags():
v = getattr(sys.flags, flag)
if v > 0:
args.append('-' + opt * v)
+ if sys.warnoptions:
+ args.append('-W')
+ args.extend(sys.warnoptions)
return args
#============================================================