summaryrefslogtreecommitdiffstats
path: root/Lib/test/support.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-03-15 20:10:33 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2011-03-15 20:10:33 (GMT)
commit8213cafd62a70881d38f9f8e88097b5af4bf998d (patch)
treed3beb5479792820d772b2ae2ec489375f4b17216 /Lib/test/support.py
parent0e63f594928ac8b4551c0f46284744a246b179fd (diff)
parent0de5fc51ff66838b5133bf4656af6a3023232b1c (diff)
downloadcpython-8213cafd62a70881d38f9f8e88097b5af4bf998d.zip
cpython-8213cafd62a70881d38f9f8e88097b5af4bf998d.tar.gz
cpython-8213cafd62a70881d38f9f8e88097b5af4bf998d.tar.bz2
Merge
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 824f45a..98f333e 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
#============================================================