summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2022-09-16 14:37:30 (GMT)
committerGitHub <noreply@github.com>2022-09-16 14:37:30 (GMT)
commit426d72e7ddb0af5cf851914ac75127186dd1ff04 (patch)
tree84b2878c3271d4e0f9637b270b6a6835ae501eef /Lib
parente47b96c44f7b48a1e95de24f38f6e3de879b4d61 (diff)
downloadcpython-426d72e7ddb0af5cf851914ac75127186dd1ff04.zip
cpython-426d72e7ddb0af5cf851914ac75127186dd1ff04.tar.gz
cpython-426d72e7ddb0af5cf851914ac75127186dd1ff04.tar.bz2
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.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/codeop.py26
-rw-r--r--Lib/test/test_codeop.py20
2 files changed, 33 insertions, 13 deletions
diff --git a/Lib/codeop.py b/Lib/codeop.py
index 45a378b..2213b69 100644
--- a/Lib/codeop.py
+++ b/Lib/codeop.py
@@ -56,22 +56,22 @@ def _maybe_compile(compiler, source, filename, symbol):
if symbol != "eval":
source = "pass" # Replace it with a 'pass' statement
- try:
- 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.
+ # Disable compiler warnings when checking for incomplete input.
with warnings.catch_warnings():
- warnings.simplefilter("error")
-
+ warnings.simplefilter("ignore", (SyntaxWarning, DeprecationWarning))
try:
- compiler(source + "\n", filename, symbol)
- except SyntaxError as e:
- if "incomplete input" in str(e):
+ compiler(source, filename, symbol)
+ except SyntaxError: # Let other compile() errors propagate.
+ try:
+ compiler(source + "\n", filename, symbol)
return None
- raise
+ except SyntaxError as e:
+ if "incomplete input" in str(e):
+ return None
+ # fallthrough
+
+ return compiler(source, filename, symbol)
+
def _is_syntax_error(err1, err2):
rep1 = repr(err1)
diff --git a/Lib/test/test_codeop.py b/Lib/test/test_codeop.py
index 17376c7..133096d 100644
--- a/Lib/test/test_codeop.py
+++ b/Lib/test/test_codeop.py
@@ -321,6 +321,26 @@ class CodeopTests(unittest.TestCase):
warnings.simplefilter('error', SyntaxWarning)
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__":
unittest.main()