commit a13d475901553b4a0ec7ed679ce2eac4598b557f
author Benjamin Peterson <benjamin@python.org> Thu Oct 16 21:17:24 2008 +0000
committer Benjamin Peterson <benjamin@python.org> Thu Oct 16 21:17:24 2008 +0000
tree dc0745a76b64e954cded961b6ec99bc08bdeac78
parent 60192084c405292f874d886eed05ed83614d20c4

merge r66932 and add a few py3k only checks

Lib/json/decoder.py

diff --git a/Lib/json/decoder.py b/Lib/json/decoder.py
index f0bc245..4e88ba6 100644
--- a/Lib/json/decoder.py
+++ b/Lib/json/decoder.py
@@ -18,11 +18,15 @@
 
 
 def linecol(doc, pos):
-    lineno = doc.count('\n', 0, pos) + 1
+    if isinstance(doc, bytes):
+        newline = b'\n'
+    else:
+        newline = '\n'
+    lineno = doc.count(newline, 0, pos) + 1
     if lineno == 1:
         colno = pos
     else:
-        colno = pos - doc.rindex('\n', 0, pos)
+        colno = pos - doc.rindex(newline, 0, pos)
     return lineno, colno