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

41 Commits

Author SHA1 Message Date
R David Murray 35893b7994 #16057: Clarify why the base method default is called in custom encoders. 
Original patch by Kushal Das.
 2013-03-17 22:06:18 -04:00
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
Ezio Melotti 43acbf1fd6 #16549: fix test failures on Windows. 2012-11-29 05:08:54 +02:00
Ezio Melotti def6ee5979 #16476: Fix json.tool to avoid including trailing whitespace. 2012-11-29 02:22:49 +02:00
Ezio Melotti d8feba904c #16549: Add tests for json.tools. Initial patch by Berker Peksag and Serhiy Storchaka. 2012-11-29 02:14:52 +02:00
Ezio Melotti 3a237ebcaa #16333: document a way to get rid of trailing whitespace when indent is used. 2012-11-29 00:22:30 +02:00
Ezio Melotti 282d331ec7 #16559: Add more tests for the json module. Patch by Serhiy Storchaka. 2012-11-26 19:22:58 +02:00
Antoine Pitrou e9e35c3f6b Issue #16228: Fix a crash in the json module where a list changes size while it is being encoded. 
Patch by Serhiy Storchaka.
 2012-11-01 20:07:40 +01:00
Andrew Svetlov 41c25ba451 Issue #14570: Document json sort_keys parameter properly. 
Patch by Chris Rebert.
 2012-10-28 14:58:52 +02:00
Petri Lehtinen f9e1f1128b #13769: Enhance docs for ensure_ascii semantics in JSON decoding functions 2012-09-01 07:29:06 +03:00
Antoine Pitrou 0e3a4c8058 Issue #15615: Add some tests for the json module's handling of invalid input data. 
Patch by Kushal Das.
 2012-08-18 20:51:05 +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 ed8cf7a543 #14875: Use float('inf') instead of float('1e66666') in the json module. 2012-05-21 17:46:55 -06:00
Benjamin Peterson f093724845 don't rely on dict order 2012-02-20 23:06:22 -05:00
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 e3992eb743 #5723: Improve json tests to be executed with and without accelerations. 2011-05-14 06:24:53 +03: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 df8a8f768d #11982: fix json.loads('""') to return u'' rather than ''. 2011-05-04 14:40: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
R David Murray ea8b6ef15f #10019: Fix regression relative to 2.6: add newlines if indent=0 
Patch by Amaury Forgeot d'Arc, updated by Sando Tosi.
 2011-04-12 21:00:26 -04:00
Ezio Melotti 4ded0c0462 Remove unnecessary imports and use assertIs instead of assertTrue. 2011-04-12 16:06:43 +03:00
Ezio Melotti 1b93021214 #9233: skip _json-specific tests when _json is not available. 2011-04-12 15:59:50 +03:00
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