- 6b60fb9 #5723: merge with 3.1. by Ezio Melotti · 13 years ago
- 04c6423 Merge with 3.1. by Ezio Melotti · 14 years ago
- d210aa1 #9233: Fix json.loads({}) to return a dict (instead of a list), when _json is not available. by Ezio Melotti · 14 years ago
- c753305 #9233: Fix json to work properly even when _json is not available. by Ezio Melotti · 14 years ago
- c524cff Merged revisions 85530,85532-85534,85538-85543,85546-85548 via svnmerge from by Georg Brandl · 14 years ago
- d4460aa #4785: document strict argument of JSONDecoder, plus add object_pairs_hook in the docstrings. by Georg Brandl · 14 years ago
- 4009c9e Merged revisions 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-83555,83558,83560 via svnmerge from by Georg Brandl · 14 years ago
- 7d6e076 Issue #7451: Improve decoding performance of JSON objects, and reduce by Antoine Pitrou · 14 years ago
- c8284cf #9087: update json docstrings -- unicode and long do not exist anymore. by Georg Brandl · 14 years ago
- c6b607d port simplejson upgrade from the trunk #4136 by Benjamin Peterson · 15 years ago
- 0ad98d8 Forward port r70471: Add object_pairs_hook. Issue 5381. by Raymond Hettinger · 15 years ago
- a13d475 merge r66932 and add a few py3k only checks by Benjamin Peterson · 16 years ago
- fd03645 #2834: Change re module semantics, so that str and bytes mixing is forbidden, by Antoine Pitrou · 16 years ago
- 9054000 Merged revisions 62734,62736,62748,62769 via svnmerge from by Christian Heimes · 16 years ago