cpython: ce583eb0bec2 (original) (raw)

Mercurial > cpython

changeset 82300:ce583eb0bec2 2.7

Issue #17225: JSON decoder now counts columns in the first line starting with 1, as in other lines. [#17225]

Serhiy Storchaka storchaka@gmail.com
date	Thu, 21 Feb 2013 20:17:54 +0200
parents	7a9ea3d08f51
children	124237eb5de9
files	Doc/library/json.rst Lib/json/__init__.py Lib/json/decoder.py Lib/json/tool.py Misc/NEWS
diffstat	5 files changed, 7 insertions(+), 4 deletions(-)[+] [-] Doc/library/json.rst 2 Lib/json/__init__.py 2 Lib/json/decoder.py 2 Lib/json/tool.py 2 Misc/NEWS 3

line wrap: on

line diff

--- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -103,7 +103,7 @@ Using json.tool from the shell to valida "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:: python

--- a/Lib/json/init.py +++ b/Lib/json/init.py @@ -95,7 +95,7 @@ Using json.tool from the shell to valida "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 = [

--- a/Lib/json/decoder.py +++ b/Lib/json/decoder.py @@ -27,7 +27,7 @@ NaN, PosInf, NegInf = _floatconstants() def linecol(doc, pos): lineno = doc.count('\n', 0, pos) + 1 if lineno == 1:

```
   colno = pos[](#l3.7)
```

```
   colno = pos + 1[](#l3.8)
```
else: colno = pos - doc.rindex('\n', 0, pos) return lineno, colno

--- a/Lib/json/tool.py +++ b/Lib/json/tool.py @@ -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

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -208,6 +208,9 @@ Core and Builtins Library ------- +- Issue #17225: JSON decoder now counts columns in the first line starting

with 1, as in other lines. +

Issue #7842: backported fix for py_compile.compile() syntax error handling.
Issue #13153: Tkinter functions now raise TclError instead of ValueError when