summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2023-10-31 13:29:42 (GMT)
committerGitHub <noreply@github.com>2023-10-31 13:29:42 (GMT)
commit08e4e11b758517ad614d71ff2377dd4057ffdcb1 (patch)
tree2488788697a8ff666fd59ba7edf06ad3c93b06d7
parentc66f0bedebeb0f63f02999fdf5c9ce9e045ea97d (diff)
downloadcpython-08e4e11b758517ad614d71ff2377dd4057ffdcb1.zip
cpython-08e4e11b758517ad614d71ff2377dd4057ffdcb1.tar.gz
cpython-08e4e11b758517ad614d71ff2377dd4057ffdcb1.tar.bz2
[3.11] gh-111380: Show SyntaxWarnings only once when parsing if invalid syntax is encouintered (GH-111381) (#111383)
gh-111380: Show SyntaxWarnings only once when parsing if invalid syntax is encouintered (GH-111381) (cherry picked from commit 3d2f1f0b830d86f16f42c42b54d3ea4453dac318) Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
-rw-r--r--Lib/test/test_string_literals.py12
-rw-r--r--Misc/NEWS.d/next/Core and Builtins/2023-10-27-11-51-40.gh-issue-111380.vgSbir.rst2
-rw-r--r--Parser/string_parser.c5
3 files changed, 19 insertions, 0 deletions
diff --git a/Lib/test/test_string_literals.py b/Lib/test/test_string_literals.py
index 7247b7e..aeec703 100644
--- a/Lib/test/test_string_literals.py
+++ b/Lib/test/test_string_literals.py
@@ -131,6 +131,18 @@ class TestLiterals(unittest.TestCase):
self.assertEqual(exc.lineno, 1)
self.assertEqual(exc.offset, 1)
+ # Check that the warning is raised ony once if there are syntax errors
+
+ with warnings.catch_warnings(record=True) as w:
+ warnings.simplefilter('always', category=DeprecationWarning)
+ with self.assertRaises(SyntaxError) as cm:
+ eval("'\\e' $")
+ exc = cm.exception
+ 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, '<string>')
+
def test_eval_str_invalid_octal_escape(self):
for i in range(0o400, 0o1000):
with self.assertWarns(DeprecationWarning):
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-27-11-51-40.gh-issue-111380.vgSbir.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-27-11-51-40.gh-issue-111380.vgSbir.rst
new file mode 100644
index 0000000..4ce6398
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2023-10-27-11-51-40.gh-issue-111380.vgSbir.rst
@@ -0,0 +1,2 @@
+Fix a bug that was causing :exc:`SyntaxWarning` to appear twice when parsing
+if invalid syntax is encountered later. Patch by Pablo galindo
diff --git a/Parser/string_parser.c b/Parser/string_parser.c
index fb2b980..7079b82 100644
--- a/Parser/string_parser.c
+++ b/Parser/string_parser.c
@@ -11,6 +11,11 @@
static int
warn_invalid_escape_sequence(Parser *p, const char *first_invalid_escape, Token *t)
{
+ if (p->call_invalid_rules) {
+ // Do not report warnings if we are in the second pass of the parser
+ // to avoid showing the warning twice.
+ return 0;
+ }
unsigned char c = *first_invalid_escape;
int octal = ('4' <= c && c <= '7');
PyObject *msg =