[3.9] bpo-41520: Fix second codeop regression (GH-21848)
Fix the repression introduced by the initial regression fix.
(cherry picked from commit c818b15fa59039de67022c29085d439fa5d3ef95)
Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
diff --git a/Lib/codeop.py b/Lib/codeop.py
index 5476292..4c10470 100644
--- a/Lib/codeop.py
+++ b/Lib/codeop.py
@@ -85,9 +85,9 @@
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 72840ca..66caf5a 100644
--- a/Lib/test/test_codeop.py
+++ b/Lib/test/test_codeop.py
@@ -306,14 +306,17 @@
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__":