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

with 1, as in other lines.

diff --git a/Doc/library/json.rst b/Doc/library/json.rst
index bdb6436e98d572b86f90eddb86a831b851a97838..f98e0ef603f7d5644f7cb5646d1edc1d6070b103 100644 (file)
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -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
 

diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py
index 44f49c4247fab80814ceee00dbf5f4274f9b6f32..48a4f8f863e44f4fba7f5bc600ca418291972b9f 100644 (file)
--- a/Lib/json/__init__.py
+++ b/Lib/json/__init__.py
@@ -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__ = [

diff --git a/Lib/json/decoder.py b/Lib/json/decoder.py
index dc1155b1cc76b4fef0e8c89a2004d6443784d0fc..0c59edd6baace234050f4e20612f1b11356be019 100644 (file)
--- a/Lib/json/decoder.py
+++ b/Lib/json/decoder.py
@@ -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

diff --git a/Lib/json/tool.py b/Lib/json/tool.py
index 0f108c6dae4bcf48d69629f166cf6cdd39b64f50..ecf9c478850279776967c05cd040d1142e649eb2 100644 (file)
--- 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

diff --git a/Misc/NEWS b/Misc/NEWS
index 8cc7f5074f7aef29fcd14571396ff996b9d3ec01..401228efc5c05327a6fbb1b1687770b2d166f87e 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -227,6 +227,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.