mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 03:22:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #17225: JSON decoder now counts columns in the first line starting

Browse source 
with 1, as in other lines.
This commit is contained in:
Serhiy Storchaka 2013-02-21 20:26:52 +02:00
commit 920007ad76
6 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Lib/test/json_tests/test_fail.py
View file

@ -125,8 +125,8 @@ class TestFail:
]
for data, msg, idx in test_cases:
self.assertRaisesRegex(ValueError,
r'^{0}: line 1 column {1} \(char {1}\)'.format(
re.escape(msg), idx),
r'^{0}: line 1 column {1} \(char {2}\)'.format(
re.escape(msg), idx + 1, idx),
self.loads, data)
def test_unexpected_data(self):
@ -155,8 +155,8 @@ class TestFail:
]
for data, msg, idx in test_cases:
self.assertRaisesRegex(ValueError,
r'^{0}: line 1 column {1} \(char {1}\)'.format(
re.escape(msg), idx),
r'^{0}: line 1 column {1} \(char {2}\)'.format(
re.escape(msg), idx + 1, idx),
self.loads, data)
def test_extra_data(self):
@ -173,10 +173,22 @@ class TestFail:
for data, msg, idx in test_cases:
self.assertRaisesRegex(ValueError,
r'^{0}: line 1 column {1} - line 1 column {2}'
r' \(char {1} - {2}\)'.format(
re.escape(msg), idx, len(data)),
r' \(char {3} - {4}\)'.format(
re.escape(msg), idx + 1, len(data) + 1, idx, len(data)),
self.loads, data)
def test_linecol(self):
test_cases = [
('!', 1, 1, 0),
(' !', 1, 2, 1),
('\n!', 2, 1, 1),
('\n \n\n !', 4, 6, 10),
]
for data, line, col, idx in test_cases:
self.assertRaisesRegex(ValueError,
r'^Expecting value: line {0} column {1}'
r' \(char {2}\)$'.format(line, col, idx),
self.loads, data)
class TestPyFail(TestFail, PyTest): pass
class TestCFail(TestFail, CTest): pass