summaryrefslogtreecommitdiffstats
path: root/Lib/codeop.py
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2022-09-25 08:21:00 (GMT)
committerGitHub <noreply@github.com>2022-09-25 08:21:00 (GMT)
commita386d1341c29b093ba496373934a4a58eb5dd342 (patch)
treec4e43bff42c772bdb97216222bf4417fb8ae21e6 /Lib/codeop.py
parent4d1de8704215858e4db1c248b6caeed40338e887 (diff)
downloadcpython-a386d1341c29b093ba496373934a4a58eb5dd342.zip
cpython-a386d1341c29b093ba496373934a4a58eb5dd342.tar.gz
cpython-a386d1341c29b093ba496373934a4a58eb5dd342.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. (cherry picked from commit 426d72e7ddb0af5cf851914ac75127186dd1ff04) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
Diffstat (limited to 'Lib/codeop.py')
-rw-r--r--Lib/codeop.py26
1 files changed, 13 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)