mirror of
https://github.com/python/cpython.git
synced 2025-08-10 03:49:18 +00:00
[3.12] gh-104972: Ensure that line attributes in tokens in the tokenize module are correct (GH-104975) (#104982)
gh-104972: Ensure that line attributes in tokens in the tokenize module are correct (GH-104975)
(cherry picked from commit 3fdb55c482
)
Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
This commit is contained in:
parent
01af2b0e51
commit
8ca29573a8
4 changed files with 21 additions and 9 deletions
|
@ -1174,7 +1174,7 @@ class Test_Tokenize(TestCase):
|
|||
|
||||
# skip the initial encoding token and the end tokens
|
||||
tokens = list(_tokenize(readline(), encoding='utf-8'))[:-2]
|
||||
expected_tokens = [TokenInfo(3, '"ЉЊЈЁЂ"', (1, 0), (1, 7), '"ЉЊЈЁЂ"')]
|
||||
expected_tokens = [TokenInfo(3, '"ЉЊЈЁЂ"', (1, 0), (1, 7), '"ЉЊЈЁЂ"\n')]
|
||||
self.assertEqual(tokens, expected_tokens,
|
||||
"bytes not decoded with encoding")
|
||||
|
||||
|
@ -1657,7 +1657,6 @@ class TestRoundtrip(TestCase):
|
|||
code = f.encode('utf-8')
|
||||
else:
|
||||
code = f.read()
|
||||
f.close()
|
||||
readline = iter(code.splitlines(keepends=True)).__next__
|
||||
tokens5 = list(tokenize(readline))
|
||||
tokens2 = [tok[:2] for tok in tokens5]
|
||||
|
@ -1672,6 +1671,17 @@ class TestRoundtrip(TestCase):
|
|||
tokens2_from5 = [tok[:2] for tok in tokenize(readline5)]
|
||||
self.assertEqual(tokens2_from5, tokens2)
|
||||
|
||||
def check_line_extraction(self, f):
|
||||
if isinstance(f, str):
|
||||
code = f.encode('utf-8')
|
||||
else:
|
||||
code = f.read()
|
||||
readline = iter(code.splitlines(keepends=True)).__next__
|
||||
for tok in tokenize(readline):
|
||||
if tok.type in {ENCODING, ENDMARKER}:
|
||||
continue
|
||||
self.assertEqual(tok.string, tok.line[tok.start[1]: tok.end[1]])
|
||||
|
||||
def test_roundtrip(self):
|
||||
# There are some standard formatting practices that are easy to get right.
|
||||
|
||||
|
@ -1768,6 +1778,7 @@ class TestRoundtrip(TestCase):
|
|||
with open(testfile, 'rb') as f:
|
||||
# with self.subTest(file=testfile):
|
||||
self.check_roundtrip(f)
|
||||
self.check_line_extraction(f)
|
||||
|
||||
|
||||
def roundtrip(self, code):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue