mirror of
https://github.com/python/cpython.git
synced 2025-08-19 08:11:46 +00:00
gh-96052: codeop: fix handling compiler warnings in incomplete input (GH-96132)
Previously codeop.compile_command() emitted compiler warnings (SyntaxWarning or
DeprecationWarning) and raised a SyntaxError for incomplete input containing
a potentially incorrect code. Now it always returns None for incomplete input
without emitting any warnings.
(cherry picked from commit 426d72e7dd
)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
This commit is contained in:
parent
437032e313
commit
f29c88de52
3 changed files with 37 additions and 13 deletions
|
@ -56,22 +56,22 @@ def _maybe_compile(compiler, source, filename, symbol):
|
||||||
if symbol != "eval":
|
if symbol != "eval":
|
||||||
source = "pass" # Replace it with a 'pass' statement
|
source = "pass" # Replace it with a 'pass' statement
|
||||||
|
|
||||||
try:
|
# Disable compiler warnings when checking for incomplete input.
|
||||||
return compiler(source, filename, symbol)
|
|
||||||
except SyntaxError: # Let other compile() errors propagate.
|
|
||||||
pass
|
|
||||||
|
|
||||||
# Catch syntax warnings after the first compile
|
|
||||||
# to emit warnings (SyntaxWarning, DeprecationWarning) at most once.
|
|
||||||
with warnings.catch_warnings():
|
with warnings.catch_warnings():
|
||||||
warnings.simplefilter("error")
|
warnings.simplefilter("ignore", (SyntaxWarning, DeprecationWarning))
|
||||||
|
try:
|
||||||
|
compiler(source, filename, symbol)
|
||||||
|
except SyntaxError: # Let other compile() errors propagate.
|
||||||
try:
|
try:
|
||||||
compiler(source + "\n", filename, symbol)
|
compiler(source + "\n", filename, symbol)
|
||||||
|
return None
|
||||||
except SyntaxError as e:
|
except SyntaxError as e:
|
||||||
if "incomplete input" in str(e):
|
if "incomplete input" in str(e):
|
||||||
return None
|
return None
|
||||||
raise
|
# fallthrough
|
||||||
|
|
||||||
|
return compiler(source, filename, symbol)
|
||||||
|
|
||||||
|
|
||||||
def _is_syntax_error(err1, err2):
|
def _is_syntax_error(err1, err2):
|
||||||
rep1 = repr(err1)
|
rep1 = repr(err1)
|
||||||
|
|
|
@ -321,6 +321,26 @@ class CodeopTests(unittest.TestCase):
|
||||||
warnings.simplefilter('error', SyntaxWarning)
|
warnings.simplefilter('error', SyntaxWarning)
|
||||||
compile_command('1 is 1', symbol='exec')
|
compile_command('1 is 1', symbol='exec')
|
||||||
|
|
||||||
|
# Check DeprecationWarning treated as an SyntaxError
|
||||||
|
with warnings.catch_warnings(), self.assertRaises(SyntaxError):
|
||||||
|
warnings.simplefilter('error', DeprecationWarning)
|
||||||
|
compile_command(r"'\e'", symbol='exec')
|
||||||
|
|
||||||
|
def test_incomplete_warning(self):
|
||||||
|
with warnings.catch_warnings(record=True) as w:
|
||||||
|
warnings.simplefilter('always')
|
||||||
|
self.assertIncomplete("'\\e' + (")
|
||||||
|
self.assertEqual(w, [])
|
||||||
|
|
||||||
|
def test_invalid_warning(self):
|
||||||
|
with warnings.catch_warnings(record=True) as w:
|
||||||
|
warnings.simplefilter('always')
|
||||||
|
self.assertInvalid("'\\e' 1")
|
||||||
|
self.assertEqual(len(w), 1)
|
||||||
|
self.assertEqual(w[0].category, DeprecationWarning)
|
||||||
|
self.assertRegex(str(w[0].message), 'invalid escape sequence')
|
||||||
|
self.assertEqual(w[0].filename, '<input>')
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
unittest.main()
|
unittest.main()
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
Fix handling compiler warnings (SyntaxWarning and DeprecationWarning) in
|
||||||
|
:func:`codeop.compile_command` when checking for incomplete input.
|
||||||
|
Previously it emitted warnings and raised a SyntaxError. Now it always
|
||||||
|
returns ``None`` for incomplete input without emitting any warnings.
|
Loading…
Add table
Add a link
Reference in a new issue