Skip to content

Commit 37324b4

Browse files
ShaharNavehShaharNaveh
committed
Update test_eof.py from 3.13.7
1 parent 88b12ba commit 37324b4

File tree

1 file changed

+138
-50
lines changed

1 file changed

+138
-50
lines changed

‎Lib/test/test_eof.py‎

Lines changed: 138 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,175 @@
11
"""test script for a few new invalid token catches"""
22

33
import sys
4-
from test import support
4+
from codecs import BOM_UTF8
5+
from test.support import force_not_colorized
56
from test.support import os_helper
67
from test.support import script_helper
78
from test.support import warnings_helper
89
import unittest
910

1011
class EOFTestCase(unittest.TestCase):
11-
# TODO: RUSTPYTHON
12-
@unittest.expectedFailure
12+
@unittest.expectedFailure # TODO: RUSTPYTHON
1313
def test_EOF_single_quote(self):
1414
expect = "unterminated string literal (detected at line 1) (<string>, line 1)"
1515
for quote in ("'", "\""):
16-
try:
16+
with self.assertRaises(SyntaxError) as cm:
1717
eval(f"""{quote}this is a test\
1818
""")
19-
except SyntaxError as msg:
20-
self.assertEqual(str(msg), expect)
21-
self.assertEqual(msg.offset, 1)
22-
else:
23-
raise support.TestFailed
24-
25-
# TODO: RUSTPYTHON
26-
@unittest.expectedFailure
19+
self.assertEqual(str(cm.exception), expect)
20+
self.assertEqual(cm.exception.offset, 1)
21+
22+
@unittest.expectedFailure # TODO: RUSTPYTHON
2723
def test_EOFS(self):
28-
expect = ("unterminated triple-quoted string literal (detected at line 1) (<string>, line 1)")
29-
try:
30-
eval("""'''this is a test""")
31-
except SyntaxError as msg:
32-
self.assertEqual(str(msg), expect)
33-
self.assertEqual(msg.offset, 1)
34-
else:
35-
raise support.TestFailed
36-
37-
# TODO: RUSTPYTHON
38-
@unittest.expectedFailure
24+
expect = ("unterminated triple-quoted string literal (detected at line 3) (<string>, line 1)")
25+
with self.assertRaises(SyntaxError) as cm:
26+
eval("""ä = '''thîs is \na \ntest""")
27+
self.assertEqual(str(cm.exception), expect)
28+
self.assertEqual(cm.exception.text, "ä = '''thîs is ")
29+
self.assertEqual(cm.exception.offset, 5)
30+
31+
with self.assertRaises(SyntaxError) as cm:
32+
eval("""ä = '''thîs is \na \ntest""".encode())
33+
self.assertEqual(str(cm.exception), expect)
34+
self.assertEqual(cm.exception.text, "ä = '''thîs is ")
35+
self.assertEqual(cm.exception.offset, 5)
36+
37+
with self.assertRaises(SyntaxError) as cm:
38+
eval(BOM_UTF8 + """ä = '''thîs is \na \ntest""".encode())
39+
self.assertEqual(str(cm.exception), expect)
40+
self.assertEqual(cm.exception.text, "ä = '''thîs is ")
41+
self.assertEqual(cm.exception.offset, 5)
42+
43+
with self.assertRaises(SyntaxError) as cm:
44+
eval("""# coding: latin1\nä = '''thîs is \na \ntest""".encode('latin1'))
45+
self.assertEqual(str(cm.exception), "unterminated triple-quoted string literal (detected at line 4) (<string>, line 2)")
46+
self.assertEqual(cm.exception.text, "ä = '''thîs is ")
47+
self.assertEqual(cm.exception.offset, 5)
48+
49+
@force_not_colorized
3950
def test_EOFS_with_file(self):
4051
expect = ("(<string>, line 1)")
4152
with os_helper.temp_dir() as temp_dir:
42-
file_name = script_helper.make_script(temp_dir, 'foo', """'''this is \na \ntest""")
43-
rc, out, err = script_helper.assert_python_failure(file_name)
44-
self.assertIn(b'unterminated triple-quoted string literal (detected at line 3)', err)
53+
file_name = script_helper.make_script(temp_dir, 'foo',
54+
"""ä = '''thîs is \na \ntest""")
55+
rc, out, err = script_helper.assert_python_failure('-X', 'utf8', file_name)
56+
err = err.decode().splitlines()
57+
self.assertEqual(err[-3:], [
58+
" ä = '''thîs is ",
59+
' ^',
60+
'SyntaxError: unterminated triple-quoted string literal (detected at line 3)'])
61+
62+
file_name = script_helper.make_script(temp_dir, 'foo',
63+
"""ä = '''thîs is \na \ntest""".encode())
64+
rc, out, err = script_helper.assert_python_failure('-X', 'utf8', file_name)
65+
err = err.decode().splitlines()
66+
self.assertEqual(err[-3:], [
67+
" ä = '''thîs is ",
68+
' ^',
69+
'SyntaxError: unterminated triple-quoted string literal (detected at line 3)'])
70+
71+
file_name = script_helper.make_script(temp_dir, 'foo',
72+
BOM_UTF8 + """ä = '''thîs is \na \ntest""".encode())
73+
rc, out, err = script_helper.assert_python_failure('-X', 'utf8', file_name)
74+
err = err.decode().splitlines()
75+
self.assertEqual(err[-3:], [
76+
" ä = '''thîs is ",
77+
' ^',
78+
'SyntaxError: unterminated triple-quoted string literal (detected at line 3)'])
79+
80+
file_name = script_helper.make_script(temp_dir, 'foo',
81+
"""# coding: latin1\nä = '''thîs is \na \ntest""".encode('latin1'))
82+
rc, out, err = script_helper.assert_python_failure('-X', 'utf8', file_name)
83+
err = err.decode().splitlines()
84+
self.assertEqual(err[-3:], [
85+
" ä = '''thîs is ",
86+
' ^',
87+
'SyntaxError: unterminated triple-quoted string literal (detected at line 4)'])
4588

46-
# TODO: RUSTPYTHON
47-
@unittest.expectedFailure
89+
@unittest.expectedFailure # TODO: RUSTPYTHON
4890
@warnings_helper.ignore_warnings(category=SyntaxWarning)
4991
def test_eof_with_line_continuation(self):
5092
expect = "unexpected EOF while parsing (<string>, line 1)"
51-
try:
93+
with self.assertRaises(SyntaxError) as cm:
5294
compile('"\\Xhh" \\', '<string>', 'exec')
53-
except SyntaxError as msg:
54-
self.assertEqual(str(msg), expect)
55-
else:
56-
raise support.TestFailed
95+
self.assertEqual(str(cm.exception), expect)
5796

58-
# TODO: RUSTPYTHON
59-
@unittest.expectedFailure
97+
@unittest.expectedFailure # TODO: RUSTPYTHON
6098
def test_line_continuation_EOF(self):
6199
"""A continuation at the end of input must be an error; bpo2180."""
62100
expect = 'unexpected EOF while parsing (<string>, line 1)'
63-
with self.assertRaises(SyntaxError) as excinfo:
64-
exec('x = 5\\')
65-
self.assertEqual(str(excinfo.exception), expect)
66-
with self.assertRaises(SyntaxError) as excinfo:
101+
with self.assertRaises(SyntaxError) as cm:
102+
exec('ä = 5\\')
103+
self.assertEqual(str(cm.exception), expect)
104+
self.assertEqual(cm.exception.text, 'ä = 5\\\n')
105+
self.assertEqual(cm.exception.offset, 7)
106+
107+
with self.assertRaises(SyntaxError) as cm:
108+
exec('ä = 5\\'.encode())
109+
self.assertEqual(str(cm.exception), expect)
110+
self.assertEqual(cm.exception.text, 'ä = 5\\\n')
111+
self.assertEqual(cm.exception.offset, 7)
112+
113+
with self.assertRaises(SyntaxError) as cm:
114+
exec('# coding:latin1\nä = 5\\'.encode('latin1'))
115+
self.assertEqual(str(cm.exception),
116+
'unexpected EOF while parsing (<string>, line 2)')
117+
self.assertEqual(cm.exception.text, 'ä = 5\\\n')
118+
self.assertEqual(cm.exception.offset, 7)
119+
120+
with self.assertRaises(SyntaxError) as cm:
121+
exec(BOM_UTF8 + 'ä = 5\\'.encode())
122+
self.assertEqual(str(cm.exception), expect)
123+
self.assertEqual(cm.exception.text, 'ä = 5\\\n')
124+
self.assertEqual(cm.exception.offset, 7)
125+
126+
with self.assertRaises(SyntaxError) as cm:
67127
exec('\\')
68-
self.assertEqual(str(excinfo.exception), expect)
128+
self.assertEqual(str(cm.exception), expect)
69129

70130
@unittest.skipIf(not sys.executable, "sys.executable required")
131+
@force_not_colorized
71132
def test_line_continuation_EOF_from_file_bpo2180(self):
72133
"""Ensure tok_nextc() does not add too many ending newlines."""
73134
with os_helper.temp_dir() as temp_dir:
74135
file_name = script_helper.make_script(temp_dir, 'foo', '\\')
75-
rc, out, err = script_helper.assert_python_failure(file_name)
76-
self.assertIn(b'unexpected EOF while parsing', err)
77-
self.assertIn(b'line 1', err)
78-
self.assertIn(b'\\', err)
79-
80-
file_name = script_helper.make_script(temp_dir, 'foo', 'y = 6\\')
81-
rc, out, err = script_helper.assert_python_failure(file_name)
82-
self.assertIn(b'unexpected EOF while parsing', err)
83-
self.assertIn(b'line 1', err)
84-
self.assertIn(b'y = 6\\', err)
136+
rc, out, err = script_helper.assert_python_failure('-X', 'utf8', file_name)
137+
err = err.decode().splitlines()
138+
self.assertEqual(err[-2:], [
139+
' \\',
140+
'SyntaxError: unexpected EOF while parsing'])
141+
self.assertEqual(err[-3][-8:], ', line 1', err)
142+
143+
file_name = script_helper.make_script(temp_dir, 'foo', 'ä = 6\\')
144+
rc, out, err = script_helper.assert_python_failure('-X', 'utf8', file_name)
145+
err = err.decode().splitlines()
146+
self.assertEqual(err[-3:], [
147+
' ä = 6\\',
148+
' ^',
149+
'SyntaxError: unexpected EOF while parsing'])
150+
self.assertEqual(err[-4][-8:], ', line 1', err)
151+
152+
file_name = script_helper.make_script(temp_dir, 'foo',
153+
'# coding:latin1\n'
154+
'ä = 7\\'.encode('latin1'))
155+
rc, out, err = script_helper.assert_python_failure('-X', 'utf8', file_name)
156+
err = err.decode().splitlines()
157+
self.assertEqual(err[-3:], [
158+
' ä = 7\\',
159+
' ^',
160+
'SyntaxError: unexpected EOF while parsing'])
161+
self.assertEqual(err[-4][-8:], ', line 2', err)
162+
163+
file_name = script_helper.make_script(temp_dir, 'foo',
164+
BOM_UTF8 + 'ä = 8\\'.encode())
165+
rc, out, err = script_helper.assert_python_failure('-X', 'utf8', file_name)
166+
err = err.decode().splitlines()
167+
self.assertEqual(err[-3:], [
168+
' ä = 8\\',
169+
' ^',
170+
'SyntaxError: unexpected EOF while parsing'])
171+
self.assertEqual(err[-4][-8:], ', line 1', err)
172+
85173

86174
if __name__ == "__main__":
87175
unittest.main()

0 commit comments

Comments
 (0)