Commit Graph

11 Commits

Author SHA1 Message Date
Ezio Melotti fda7a8ce78 #17368: Fix an off-by-one error in the Python JSON decoder that caused a failure while decoding empty object literals when object_pairs_hook was specified. 2013-03-13 01:49:57 +02:00
Serhiy Storchaka 49d4022d7d Issue #17225: JSON decoder now counts columns in the first line starting
with 1, as in other lines.
2013-02-21 20:17:54 +02:00
Antoine Pitrou d9a5137742 Issue #5067: improve some json error messages.
Patch by Serhiy Storchaka.
2012-06-29 01:58:26 +02:00
Ezio Melotti e3992eb743 #5723: Improve json tests to be executed with and without accelerations. 2011-05-14 06:24:53 +03:00
Ezio Melotti 2b96f0987a #9233: Fix json.loads({}) to return a dict (instead of a list), when _json is not available. 2011-04-13 05:37:29 +03:00
Georg Brandl db949b8fae Recorded merge of revisions 85543 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85543 | georg.brandl | 2010-10-15 19:03:02 +0200 (Fr, 15 Okt 2010) | 1 line

  #4785: document strict argument of JSONDecoder, plus add object_pairs_hook in the docstrings.
........
2010-10-15 17:04:45 +00:00
Ezio Melotti ffd849618a #7092: fix DeprecationWarnings for json when the tests are run with -3 -Wd. 2010-01-26 15:57:21 +00:00
Raymond Hettinger 91852ca673 Issue 5381: Add object_pairs_hook to the json module. 2009-03-19 19:19:03 +00:00
Bob Ippolito d914e3f861 merge json library with simplejson 2.0.9 (issue 4136) 2009-03-17 23:19:00 +00:00
Christian Heimes c8a0d2f368 Intern static string
Use float constructors instead of magic code for float constants
2008-05-06 16:18:41 +00:00
Brett Cannon 4b964f9c90 Add the 'json' package. Code taken from simplejson 1.9 and contributed by Bob
Ippolito.

Closes issue #2750.
2008-05-05 20:21:38 +00:00