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

with 1, as in other lines.
This commit is contained in:
Serhiy Storchaka 2013-02-21 20:21:21 +02:00
commit ed891c1517
5 changed files with 7 additions and 4 deletions

View File

@ -102,7 +102,7 @@ Using json.tool from the shell to validate and pretty-print::
"json": "obj"
}
$ echo '{1.2:3.4}' | python -mjson.tool
Expecting property name enclosed in double quotes: line 1 column 1 (char 1)
Expecting property name enclosed in double quotes: line 1 column 2 (char 1)
.. highlight:: python3

View File

@ -97,7 +97,7 @@ Using json.tool from the shell to validate and pretty-print::
"json": "obj"
}
$ echo '{ 1.2:3.4}' | python -m json.tool
Expecting property name enclosed in double quotes: line 1 column 2 (char 2)
Expecting property name enclosed in double quotes: line 1 column 3 (char 2)
"""
__version__ = '2.0.9'
__all__ = [

View File

@ -32,7 +32,7 @@ def linecol(doc, pos):
newline = '\n'
lineno = doc.count(newline, 0, pos) + 1
if lineno == 1:
colno = pos
colno = pos + 1
else:
colno = pos - doc.rindex(newline, 0, pos)
return lineno, colno

View File

@ -7,7 +7,7 @@ Usage::
"json": "obj"
}
$ echo '{ 1.2:3.4}' | python -m json.tool
Expecting property name enclosed in double quotes: line 1 column 2 (char 2)
Expecting property name enclosed in double quotes: line 1 column 3 (char 2)
"""
import sys

View File

@ -181,6 +181,9 @@ Core and Builtins
Library
-------
- Issue #17225: JSON decoder now counts columns in the first line starting
with 1, as in other lines.
- Issue #13700: Fix byte/string handling in imaplib authentication when an
authobject is specified.