Skip to content

bpo-41520: Fix second codeop regression #21848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 13, 2020
Merged

bpo-41520: Fix second codeop regression #21848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
450ede4
bpo-41520: Fix second codeop repression
terryjreedy Aug 12, 2020
bb43d3e
Fix news.
terryjreedy Aug 12, 2020
409f46c
Don't alter the execution environment.
terryjreedy Aug 12, 2020
09af3f5
Update Lib/codeop.py
terryjreedy Aug 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Lib/codeop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
13 changes: 8 additions & 5 deletions Lib/test/test_codeop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,14 +307,17 @@ def test_filename(self):

def test_warning(self):
# Test that the warning is only returned once.
with warnings_helper.check_warnings((".*literal", SyntaxWarning)) as w:
compile_command("0 is 0")
self.assertEqual(len(w.warnings), 1)
with warnings_helper.check_warnings(
(".*literal", SyntaxWarning),
(".*invalid", DeprecationWarning),
) as w:
compile_command(r"'\e' is 0")
self.assertEqual(len(w.warnings), 2)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be possible to another test which only emits a single warning? For example, keep the existing "0 is 0" test, but add your new test as a new one (don't replace the existing one).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check_warnings checks that each of the two warnings is called, so that 2 must be 1+1 and not 2+0, so the above is, in a sense, two independent tests. We are not testing builtin compile, but that compile_command only lets 1+1 of the 3+3 warnings pass to the caller.


# 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__":
Expand Down
2 changes: 1 addition & 1 deletion Misc/NEWS.d/next/Library/2020-08-12-13-25-16.bpo-41520.BEUWa4.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Fix :mod:`codeop` regression: it no longer ignores :exc:`SyntaxWarning`.
Fix :mod:`codeop` regression that prevented turning compile warnings into errors.