Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #5067: improve some json error messages. 

Patch by Serhiy Storchaka.
This commit is contained in:
Antoine Pitrou 2012-06-29 01:58:26 +02:00
parent d958cc960f
commit d9a5137742
5 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Doc/library/json.rst
View File

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

2
Lib/json/__init__.py
View File

@ -95,7 +95,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: line 1 column 2 (char 2)
Expecting property name enclosed in double quotes: line 1 column 2 (char 2)
"""
__version__ = '2.0.9'
__all__ = [

15
Lib/json/decoder.py
View File

@ -169,7 +169,8 @@ def JSONObject(s_and_end, encoding, strict, scan_once, object_hook,
pairs = object_hook(pairs)
return pairs, end + 1
elif nextchar != '"':
raise ValueError(errmsg("Expecting property name", s, end))
raise ValueError(errmsg(
"Expecting property name enclosed in double quotes", s, end))
end += 1
while True:
key, end = scanstring(s, end, encoding, strict)
@ -179,8 +180,7 @@ def JSONObject(s_and_end, encoding, strict, scan_once, object_hook,
if s[end:end + 1] != ':':
end = _w(s, end).end()
if s[end:end + 1] != ':':
raise ValueError(errmsg("Expecting : delimiter", s, end))
raise ValueError(errmsg("Expecting ':' delimiter", s, end))
end += 1
try:
@ -209,7 +209,7 @@ def JSONObject(s_and_end, encoding, strict, scan_once, object_hook,
if nextchar == '}':
break
elif nextchar != ',':
raise ValueError(errmsg("Expecting , delimiter", s, end - 1))
raise ValueError(errmsg("Expecting ',' delimiter", s, end - 1))
try:
nextchar = s[end]
@ -224,8 +224,8 @@ def JSONObject(s_and_end, encoding, strict, scan_once, object_hook,
end += 1
if nextchar != '"':
raise ValueError(errmsg("Expecting property name", s, end - 1))
raise ValueError(errmsg(
"Expecting property name enclosed in double quotes", s, end - 1))
if object_pairs_hook is not None:
result = object_pairs_hook(pairs)
return result, end
@ -259,8 +259,7 @@ def JSONArray(s_and_end, scan_once, _w=WHITESPACE.match, _ws=WHITESPACE_STR):
if nextchar == ']':
break
elif nextchar != ',':
raise ValueError(errmsg("Expecting , delimiter", s, end))
raise ValueError(errmsg("Expecting ',' delimiter", s, end))
try:
if s[end] in _ws:
end += 1

2
Lib/json/tool.py
View File

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

8
Modules/_json.c
View File

@ -1032,7 +1032,7 @@ _parse_object_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ss
while (idx <= end_idx) {
/* read key */
if (str[idx] != '"') {
raise_errmsg("Expecting property name", pystr, idx);
raise_errmsg("Expecting property name enclosed in double quotes", pystr, idx);
goto bail;
}
key = scanstring_unicode(pystr, idx + 1, strict, &next_idx);
@ -1043,7 +1043,7 @@ _parse_object_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ss
/* skip whitespace between key and : delimiter, read :, skip whitespace */
while (idx <= end_idx && IS_WHITESPACE(str[idx])) idx++;
if (idx > end_idx || str[idx] != ':') {
raise_errmsg("Expecting : delimiter", pystr, idx);
raise_errmsg("Expecting ':' delimiter", pystr, idx);
goto bail;
}
idx++;
@ -1075,7 +1075,7 @@ _parse_object_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ss
break;
}
else if (str[idx] != ',') {
raise_errmsg("Expecting , delimiter", pystr, idx);
raise_errmsg("Expecting ',' delimiter", pystr, idx);
goto bail;
}
idx++;
@ -1236,7 +1236,7 @@ _parse_array_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ssi
break;
}
else if (str[idx] != ',') {
raise_errmsg("Expecting , delimiter", pystr, idx);
raise_errmsg("Expecting ',' delimiter", pystr, idx);
goto bail;
}
idx++;