Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity
50,835 Commits 6 Branches 592 Tags 2.4 GiB
Commit Graph

26 Commits

Author SHA1 Message Date
Amaury Forgeot d'Arc dee76e627d Issue #13774: json: Fix a SystemError when a bogus encoding is passed to 
json.loads().
 2012-01-13 22:53:25 +01:00
Ezio Melotti c1ec7b5d44 #12051: Fix segfault in json.dumps() while encoding highly-nested objects using the C accelerations. 2011-05-11 00:55:35 +03:00
Ezio Melotti cec464951e #12017: Fix segfault in json.loads() while decoding highly-nested objects using the C accelerations. 2011-05-07 17:40:23 +03:00
Ezio Melotti f5164f6e93 #11982: remove now unused function. 2011-05-04 15:28:31 +03:00
Ezio Melotti df8a8f768d #11982: fix json.loads('""') to return u'' rather than ''. 2011-05-04 14:40:53 +03:00
Georg Brandl d823bdcb0e #10804: fix copy-paste error when checking assigned fields for NULL. 2011-01-02 14:20:16 +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
Antoine Pitrou 22ad24528e Merged revisions 85342 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85342 | antoine.pitrou | 2010-10-09 17:24:28 +0200 (sam., 09 oct. 2010) | 4 lines

  Issue #10055: Make json C89-compliant in UCS4 mode.
........
 2010-10-09 15:28:59 +00:00
Doug Hellmann f31db93fc1 Apply patch from Ray Allen for issue 9296 2010-07-21 12:36:33 +00:00
Brett Cannon 8e9757e432 Remove unneeded variable mutation and initializations. 
Found using Clang's static analyzer.
 2010-05-03 23:43:49 +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
Eric Smith 129c97df02 Issue 7117: Replace PyOS_ascii_strtod with PyOS_string_to_double in _json.c as part of short float repr. Change made after consulting with Bob Ippolito. This completes the removal of calls to PyOS_ascii_strtod. 2009-10-28 08:44:37 +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 a0b8d9ad2d Silence a compiler warning. 2009-03-19 19:24:43 +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 336680ecea fix more possible ref leaks in _json and use Py_CLEAR 2008-10-16 21:48:06 +00:00
Benjamin Peterson 87e6ad290b fix possible ref leak 2008-10-16 21:27:54 +00:00
Benjamin Peterson 595e3cbb3d check for error conditions in _json #3623 2008-10-16 21:09:28 +00:00
Bob Ippolito d648f64a53 #3322: bounds checking for _json.scanstring 2008-07-19 21:59:50 +00:00
Gregory P. Smith dd96db63f6 This reverts r63675 based on the discussion in this thread: 
http://mail.python.org/pipermail/python-dev/2008-June/079988.html

Python 2.6 should stick with PyString_* in its codebase.  The PyBytes_* names
in the spirit of 3.0 are available via a #define only.  See the email thread.
 2008-06-09 04:58:54 +00:00
Christian Heimes 593daf545b Renamed PyString to PyBytes 2008-05-26 12:51:38 +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