14 Commits (3bf01757b668eefd9cd2b80887ca824ef3dca777)

Author SHA1 Message Date
Ezio Melotti 6b60fb9148 #5723: merge with 3.1. 15 years ago
Ezio Melotti 3c0d8a1cc7 #5723: Improve json tests to be executed with and without accelerations. 15 years ago
Ezio Melotti d210aa1ad9 #9233: Fix json.loads({}) to return a dict (instead of a list), when _json is not available. 15 years ago
Ezio Melotti c753305180 #9233: Fix json to work properly even when _json is not available. 15 years ago
Georg Brandl c524cff3d3 Merged revisions 85530,85532-85534,85538-85543,85546-85548 via svnmerge from 15 years ago
Georg Brandl d4460aaacd #4785: document strict argument of JSONDecoder, plus add object_pairs_hook in the docstrings. 15 years ago
Georg Brandl 4009c9edfc Merged revisions 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-83555,83558,83560 via svnmerge from 16 years ago
Antoine Pitrou 7d6e076f6d Issue #7451: Improve decoding performance of JSON objects, and reduce 16 years ago
Georg Brandl c8284cfc57 #9087: update json docstrings -- unicode and long do not exist anymore. 16 years ago
Benjamin Peterson c6b607d4a9 port simplejson upgrade from the trunk #4136 17 years ago
Raymond Hettinger 0ad98d8509 Forward port r70471: Add object_pairs_hook. Issue 5381. 17 years ago
Benjamin Peterson a13d475901 merge r66932 and add a few py3k only checks 17 years ago
Antoine Pitrou fd036451bf #2834: Change re module semantics, so that str and bytes mixing is forbidden, 18 years ago
Christian Heimes 90540004d3 Merged revisions 62734,62736,62748,62769 via svnmerge from 18 years ago