Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity
45,972 Commits 7 Branches 587 Tags 2.3 GiB
Commit Graph

17 Commits

Author SHA1 Message Date
Ezio Melotti 2623a37852 Merged revisions 86596 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86596 | ezio.melotti | 2010-11-20 21:04:17 +0200 (Sat, 20 Nov 2010) | 1 line

  #9424: Replace deprecated assert* methods in the Python test suite.
........
 2010-11-21 13:34:58 +00:00
Barry Warsaw fa6582752a Issue 10038. Restore the Python 2.6 behavior that json.loads() always returns 
unicode.  Patch by Patch by Walter Dörwald.
 2010-11-02 21:03:09 +00:00
Raymond Hettinger cbba8d4c7a Backport r72961 fixing issue #6105: json.dumps not following OrderedDict iteration order. 2010-10-30 07:29:44 +00: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
Doug Hellmann f31db93fc1 Apply patch from Ray Allen for issue 9296 2010-07-21 12:36:33 +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
Antoine Pitrou 187177fc55 Issue #6986: Fix crash in the JSON C accelerator when called with the 
wrong parameter types.  Patch by Victor Stinner.
 2009-12-08 15:40:51 +00:00
Benjamin Peterson 5c8da86f3a convert usage of fail* to assert* 2009-06-30 22:57:08 +00:00
Georg Brandl f71ba95e91 #5932: fix error return in _convertPyInt_AsSsize_t() conversion function. 2009-05-05 07:48:12 +00:00
Bob Ippolito 76a982a027 Issue 5381: fix regression in pure python code path, Issue 5584: fix a decoder bug for unicode float literals outside of a container 2009-03-29 22:33:58 +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
Benjamin Peterson 595e3cbb3d check for error conditions in _json #3623 2008-10-16 21:09:28 +00:00
Christian Heimes 33e4a98a3e Replace more float hacks with correct math functions 2008-05-07 22:54:17 +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
Benjamin Peterson 0b7f77847a PEP 8 nits in json package 2008-05-06 02:51:10 +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