[Python-checkins] cpython (merge default -> default): merge head
gregory.p.smith
python-checkins at python.org
Tue Mar 15 21:05:03 CET 2011
http://hg.python.org/cpython/rev/7dae44d1b03e
changeset: 68535:7dae44d1b03e
parent: 68534:8d3bcf57977b
parent: 68532:e04253f3ad4a
user: Gregory P. Smith <greg at krypto.org>
date: Tue Mar 15 16:04:54 2011 -0400
summary:
merge head
files:
diff --git a/Lib/test/support.py b/Lib/test/support.py
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -1374,7 +1374,7 @@
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 @@
v = getattr(sys.flags, flag)
if v > 0:
args.append('-' + opt * v)
+ if sys.warnoptions:
+ args.append('-W')
+ args.extend(sys.warnoptions)
return args
#============================================================
diff --git a/Lib/test/test_fileinput.py b/Lib/test/test_fileinput.py
--- a/Lib/test/test_fileinput.py
+++ b/Lib/test/test_fileinput.py
@@ -277,7 +277,7 @@
def test_empty_files_list_specified_to_constructor(self):
with FileInput(files=[]) as fi:
- self.assertEquals(fi._files, ('-',))
+ self.assertEqual(fi._files, ('-',))
def test__getitem__(self):
"""Tests invoking FileInput.__getitem__() with the current
@@ -298,7 +298,7 @@
with FileInput(files=[t]) as fi:
with self.assertRaises(RuntimeError) as cm:
fi[1]
- self.assertEquals(cm.exception.args, ("accessing lines out of order",))
+ self.assertEqual(cm.exception.args, ("accessing lines out of order",))
def test__getitem__eof(self):
"""Tests invoking FileInput.__getitem__() with the line number but at
@@ -308,7 +308,7 @@
with FileInput(files=[t]) as fi:
with self.assertRaises(IndexError) as cm:
fi[0]
- self.assertEquals(cm.exception.args, ("end of input reached",))
+ self.assertEqual(cm.exception.args, ("end of input reached",))
def test_nextfile_oserror_deleting_backup(self):
"""Tests invoking FileInput.nextfile() when the attempt to delete
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list