From d47af531266000a3e22f36ba4ce83dbfb5c0362b Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Tue, 15 Mar 2011 15:55:12 -0400 Subject: [PATCH 1/2] Move off of assertEquals() and over to assertEqual(). --- Lib/test/test_fileinput.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_fileinput.py b/Lib/test/test_fileinput.py index 7afb88c7bfc..27ceaf6719c 100644 --- a/Lib/test/test_fileinput.py +++ b/Lib/test/test_fileinput.py @@ -277,7 +277,7 @@ class FileInputTests(unittest.TestCase): 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 @@ class FileInputTests(unittest.TestCase): 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 @@ class FileInputTests(unittest.TestCase): 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 From b880c1558e8562351e75837e1ba2932ae5d17111 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Tue, 15 Mar 2011 16:03:09 -0400 Subject: [PATCH 2/2] Add warnings support to test.support.args_from_interpreter_flags(). This allows the -j flag to regrtest to propagate warnings settings properly. --- Lib/test/support.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Lib/test/support.py b/Lib/test/support.py index 53c2956dd0b..f5a53ca6281 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 #============================================================