mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-02 16:13:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

[3.10] Backport bpo-47212 (GH-32302) to Python 3.10 (GH-32334)

Browse source 
(cherry picked from commit aa0f056a00)

# Conflicts:
#	Grammar/python.gram
#	Parser/action_helpers.c

Automerge-Triggered-By: GH:pablogsal
This commit is contained in:
Matthieu Dartiailh 2022-04-05 18:21:49 +02:00 • committed by GitHub
parent 857cf55cbd
commit 94609e3192
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 28 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/test/test_exceptions.py
View file

@ -198,12 +198,17 @@ class ExceptionTests(unittest.TestCase):
s = '''if True:\n print()\n\texec "mixed tabs and spaces"'''
ckmsg(s, "inconsistent use of tabs and spaces in indentation", TabError)
def check(self, src, lineno, offset, encoding='utf-8'):
def check(self, src, lineno, offset, end_lineno=None, end_offset=None, encoding='utf-8'):
with self.subTest(source=src, lineno=lineno, offset=offset):
with self.assertRaises(SyntaxError) as cm:
compile(src, '<fragment>', 'exec')
self.assertEqual(cm.exception.lineno, lineno)
self.assertEqual(cm.exception.offset, offset)
if end_lineno is not None:
self.assertEqual(cm.exception.end_lineno, end_lineno)
if end_offset is not None:
self.assertEqual(cm.exception.end_offset, end_offset)
if cm.exception.text is not None:
if not isinstance(src, str):
src = src.decode(encoding, 'replace')
@ -235,6 +240,10 @@ class ExceptionTests(unittest.TestCase):
check('match ...:\n case {**rest, "key": value}:\n ...', 2, 19)
check("[a b c d e f]", 1, 2)
check("for x yfff:", 1, 7)
check("f(a for a in b, c)", 1, 3, 1, 15)
check("f(a for a in b if a, c)", 1, 3, 1, 20)
check("f(a, b for b in c)", 1, 6, 1, 18)
check("f(a, b for b in c, d)", 1, 6, 1, 18)
# Errors thrown by compile.c
check('class foo:return 1', 1, 11)