fix off-by-one error in the colno of JSONDecodeError when lineno == 0 (#57)

CHANGES.txt

+Version 3.0.9 released 2013-02-21
+
+* Fix an off-by-one error in the colno property of JSONDecodeError
+  (when lineno == 1)
+  http://bugs.python.org/issue17225
+
 Version 3.0.8 released 2013-02-19
 
 * Fix a Python 2.x compiler warning for narrow unicode builds

conf.py

@@ -44,7 +44,7 @@
 # The short X.Y version.
 version = '3.0'
 # The full version, including alpha/beta/rc tags.
-release = '3.0.8'
+release = '3.0.9'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:

index.rst

@@ -117,7 +117,7 @@
         "json": "obj"
     }
     $ echo '{ 1.2:3.4}' | python -m simplejson.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)
 
 .. highlight:: python
 

setup.py

@@ -8,7 +8,7 @@
     DistutilsPlatformError
 
 IS_PYPY = hasattr(sys, 'pypy_translation_info')
-VERSION = '3.0.8'
+VERSION = '3.0.9'
 DESCRIPTION = "Simple, fast, extensible JSON encoder/decoder for Python"
 
 with open('README.rst', 'r') as f:

simplejson/__init__.py

@@ -96,6 +96,6 @@
         "json": "obj"
     }
     $ echo '{ 1.2:3.4}' | python -m simplejson.tool
-    Expecting property name: line 1 column 2 (char 2)
+    Expecting property name: line 1 column 3 (char 2)
 """
 from __future__ import absolute_import
@@ -100,6 +100,6 @@
 """
 from __future__ import absolute_import
-__version__ = '3.0.8'
+__version__ = '3.0.9'
 __all__ = [
     'dump', 'dumps', 'load', 'loads',
     'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',

simplejson/decoder.py

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

simplejson/tests/test_errors.py

@@ -32,4 +32,4 @@
             else:
                 self.fail('Expected JSONDecodeError')
             self.assertEqual(err.lineno, 1)
-            self.assertEqual(err.colno, 9)
+            self.assertEqual(err.colno, 10)

simplejson/tests/test_fail.py

@@ -111,7 +111,7 @@
                 e = sys.exc_info()[1]
                 self.assertEqual(e.pos, 1)
                 self.assertEqual(e.lineno, 1)
-                self.assertEqual(e.colno, 1)
+                self.assertEqual(e.colno, 2)
             except Exception:
                 e = sys.exc_info()[1]
                 self.fail("Unexpected exception raised %r %s" % (e, e))