From 64ee42c073e10a78ba9cd57095f4ab418bf745a8 Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Thu, 13 Aug 2020 13:35:46 -0400 Subject: [PATCH 1/2] [3.9] bpo-41520: Fix second codeop regression (GH-21848) Fix the repression introduced by the initial regression fix. (cherry picked from commit c818b15fa59039de67022c29085d439fa5d3ef95) --- Lib/codeop.py | 4 ++-- Lib/test/test_codeop.py | 13 ++++++++----- .../2020-08-12-13-25-16.bpo-41520.BEUWa4.rst | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Lib/codeop.py b/Lib/codeop.py index 547629262d0689..4c10470aee7b7c 100644 --- a/Lib/codeop.py +++ b/Lib/codeop.py @@ -85,9 +85,9 @@ def _maybe_compile(compiler, source, filename, symbol): pass # Catch syntax warnings after the first compile - # to emit SyntaxWarning at most once. + # to emit warnings (SyntaxWarning, DeprecationWarning) at most once. with warnings.catch_warnings(): - warnings.simplefilter("error", SyntaxWarning) + warnings.simplefilter("error") try: code1 = compiler(source + "\n", filename, symbol) diff --git a/Lib/test/test_codeop.py b/Lib/test/test_codeop.py index 72840cae1d9e98..66caf5aaae32b9 100644 --- a/Lib/test/test_codeop.py +++ b/Lib/test/test_codeop.py @@ -306,14 +306,17 @@ def test_filename(self): def test_warning(self): # Test that the warning is only returned once. - with support.check_warnings((".*literal", SyntaxWarning)) as w: - compile_command("0 is 0") - self.assertEqual(len(w.warnings), 1) + with support.check_warnings( + (".*literal", SyntaxWarning), + (".*invalid", DeprecationWarning), + ) as w: + compile_command(r"'\e' is 0") + self.assertEqual(len(w.warnings), 2) # bpo-41520: check SyntaxWarning treated as an SyntaxError - with self.assertRaises(SyntaxError): + with warnings.catch_warnings(), self.assertRaises(SyntaxError): warnings.simplefilter('error', SyntaxWarning) - compile_command('1 is 1\n', symbol='exec') + compile_command('1 is 1', symbol='exec') if __name__ == "__main__": diff --git a/Misc/NEWS.d/next/Library/2020-08-12-13-25-16.bpo-41520.BEUWa4.rst b/Misc/NEWS.d/next/Library/2020-08-12-13-25-16.bpo-41520.BEUWa4.rst index ca5501c2aeec0d..0e140d91bb4b61 100644 --- a/Misc/NEWS.d/next/Library/2020-08-12-13-25-16.bpo-41520.BEUWa4.rst +++ b/Misc/NEWS.d/next/Library/2020-08-12-13-25-16.bpo-41520.BEUWa4.rst @@ -1 +1 @@ -Fix :mod:`codeop` regression: it no longer ignores :exc:`SyntaxWarning`. +Fix :mod:`codeop` regression that prevented turning compile warnings into errors. From 9f1a0e7c200ca8c03a9cafa187cec28f5c426add Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Thu, 13 Aug 2020 13:38:48 -0400 Subject: [PATCH 2/2] [3.9] bpo-41520: Fix second codeop regression (GH-21848) * bpo-41520: Fix second codeop repression Fix the repression introduced by the initial regression fix.. (cherry picked from commit c818b15fa59039de67022c29085d439fa5d3ef95) Co-authored-by: Terry Jan Reedy