summaryrefslogtreecommitdiffstats
path: root/Modules/_json.c
Commit message (Collapse)AuthorAgeFilesLines
* Issue #16228: Fix a crash in the json module where a list changes size while ↵Antoine Pitrou2012-11-011-7/+3
| | | | | | it is being encoded. Patch by Serhiy Storchaka.
* Issue #5067: improve some json error messages.Antoine Pitrou2012-06-281-4/+4
| | | | Patch by Serhiy Storchaka.
* #12051: merge with 3.1.Ezio Melotti2011-05-101-2/+15
|\
| * #12051: Fix segfault in json.dumps() while encoding highly-nested objects ↵Ezio Melotti2011-05-101-2/+15
| | | | | | | | using the C accelerations.
* | #12017: merge with 3.1.Ezio Melotti2011-05-071-2/+13
|\ \ | |/
| * #12017: Fix segfault in json.loads() while decoding highly-nested objects ↵Ezio Melotti2011-05-071-2/+13
| | | | | | | | using the C accelerations.
| * Merged revisions 85342 via svnmerge fromAntoine Pitrou2010-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | 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. ........
| * Merged revisions ↵Georg Brandl2010-10-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-83555,83558,83560 via svnmerge from svn+ssh://svn.python.org/python/branches/py3k ........ r82805 | georg.brandl | 2010-07-11 11:42:10 +0200 (So, 11 Jul 2010) | 1 line #7935: cross-reference to ast.literal_eval() from eval() docs. ........ r82806 | georg.brandl | 2010-07-11 12:22:44 +0200 (So, 11 Jul 2010) | 1 line #9223: link to Command class reference, and move Command interface docs nearer to class docs. ........ r83523 | georg.brandl | 2010-08-02 14:06:18 +0200 (Mo, 02 Aug 2010) | 1 line #9209 and #7781: fix two crashes in pstats interactive browser. ........ r83524 | georg.brandl | 2010-08-02 14:20:23 +0200 (Mo, 02 Aug 2010) | 1 line #9428: fix running scripts from profile/cProfile with their own name and the right namespace. Same fix as for trace.py in #1690103. ........ r83525 | georg.brandl | 2010-08-02 14:36:24 +0200 (Mo, 02 Aug 2010) | 1 line Get rid of spurious "threading" entries in trace output. ........ r83526 | georg.brandl | 2010-08-02 14:40:22 +0200 (Mo, 02 Aug 2010) | 1 line Fix softspace relic. ........ r83527 | georg.brandl | 2010-08-02 14:48:46 +0200 (Mo, 02 Aug 2010) | 1 line #3821: beginnings of a trace.py unittest. ........ r83536 | georg.brandl | 2010-08-02 19:49:25 +0200 (Mo, 02 Aug 2010) | 1 line #8578: mention danger of not incref'ing weak referenced object. ........ r83538 | georg.brandl | 2010-08-02 20:10:13 +0200 (Mo, 02 Aug 2010) | 1 line #6928: fix class docs w.r.t. new metaclasses. ........ r83542 | georg.brandl | 2010-08-02 20:56:54 +0200 (Mo, 02 Aug 2010) | 1 line Move test_SimpleHTTPServer into test_httpservers. ........ r83546 | georg.brandl | 2010-08-02 21:16:34 +0200 (Mo, 02 Aug 2010) | 1 line #7973: Fix distutils options spelling. ........ r83547 | georg.brandl | 2010-08-02 21:19:26 +0200 (Mo, 02 Aug 2010) | 1 line #7386: add example that shows that trailing path separators are stripped. ........ r83548 | georg.brandl | 2010-08-02 21:23:34 +0200 (Mo, 02 Aug 2010) | 1 line #8172: how does one use a property? ........ r83550 | georg.brandl | 2010-08-02 21:32:43 +0200 (Mo, 02 Aug 2010) | 1 line #9451: strengthen warning about __*__ special name usage. ........ r83551 | georg.brandl | 2010-08-02 21:35:06 +0200 (Mo, 02 Aug 2010) | 1 line Remove XXX comment that was displayed. ........ r83552 | georg.brandl | 2010-08-02 21:36:36 +0200 (Mo, 02 Aug 2010) | 1 line #9438: clarify that constant names also cannot be assigned as attributes. ........ r83553 | georg.brandl | 2010-08-02 21:39:17 +0200 (Mo, 02 Aug 2010) | 1 line Remove redundant information. ........ r83554 | georg.brandl | 2010-08-02 21:43:05 +0200 (Mo, 02 Aug 2010) | 1 line #7280: note about nasmw.exe. ........ r83555 | georg.brandl | 2010-08-02 21:44:48 +0200 (Mo, 02 Aug 2010) | 1 line #8861: remove unused variable. ........ r83558 | georg.brandl | 2010-08-02 22:05:19 +0200 (Mo, 02 Aug 2010) | 1 line #8648: document UTF-7 codec functions. ........ r83560 | georg.brandl | 2010-08-02 22:16:18 +0200 (Mo, 02 Aug 2010) | 1 line #9087: update json docstrings -- unicode and long do not exist anymore. ........
| * Merged revisions 83016 via svnmerge fromDoug Hellmann2010-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83016 | doug.hellmann | 2010-07-21 08:29:04 -0400 (Wed, 21 Jul 2010) | 1 line Apply patch from Ray Allen for issue 9296 ........
| * Recorded merge of revisions 81032 via svnmerge fromAntoine Pitrou2010-05-091-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r81032 | antoine.pitrou | 2010-05-09 17:52:27 +0200 (dim., 09 mai 2010) | 9 lines Recorded merge of revisions 81029 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines Untabify C files. Will watch buildbots. ........ ................
| * Merged revisions 76710 via svnmerge fromAntoine Pitrou2009-12-081-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r76710 | antoine.pitrou | 2009-12-08 16:57:31 +0100 (mar., 08 déc. 2009) | 10 lines Merged revisions 76708 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76708 | antoine.pitrou | 2009-12-08 16:40:51 +0100 (mar., 08 déc. 2009) | 4 lines Issue #6986: Fix crash in the JSON C accelerator when called with the wrong parameter types. Patch by Victor Stinner. ........ ................
* | Issue #10314: improve performance of JSON encoding with sort_keys=TrueAntoine Pitrou2010-11-041-20/+25
| |
* | Issue #10055: Make json C89-compliant in UCS4 mode.Antoine Pitrou2010-10-091-1/+1
| |
* | Issue #7451: Improve decoding performance of JSON objects, and reduceAntoine Pitrou2010-09-041-45/+82
| | | | | | | | | | the memory consumption of said decoded objects when they use the same strings as keys.
* | #9087: update json docstrings -- unicode and long do not exist anymore.Georg Brandl2010-08-021-3/+3
| |
* | Apply patch from Ray Allen for issue 9296Doug Hellmann2010-07-211-1/+1
| |
* | Recorded merge of revisions 81029 via svnmerge fromAntoine Pitrou2010-05-091-18/+18
| | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines Untabify C files. Will watch buildbots. ........
* | Merged revisions 76708 via svnmerge fromAntoine Pitrou2009-12-081-4/+15
|/ | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r76708 | antoine.pitrou | 2009-12-08 16:40:51 +0100 (mar., 08 déc. 2009) | 4 lines Issue #6986: Fix crash in the JSON C accelerator when called with the wrong parameter types. Patch by Victor Stinner. ........
* Fix TODO: do the sort by just the key, not the key/value pair.Raymond Hettinger2009-05-271-15/+20
|
* * Fix-up a TODO (support the sort_key option).Raymond Hettinger2009-05-271-20/+40
| | | | | | | | * Fix an error where True/False were being written-out as title-cased strings when used a dictionary keys. * Speed-up iteration over dicts by looping over items() rather than keys() followed by value lookups. * TODO: sort only by keys, not keys and values.
* Issue 6105: json encoder to respect iteration order of its inputs.Raymond Hettinger2009-05-271-5/+22
|
* Merged revisions 72314 via svnmerge fromGeorg Brandl2009-05-051-3/+3
| | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r72314 | georg.brandl | 2009-05-05 09:48:12 +0200 (Di, 05 Mai 2009) | 1 line #5932: fix error return in _convertPyInt_AsSsize_t() conversion function. ........
* Fixed warning. (Should not use *const* as variable name)Hirokazu Yamamoto2009-05-021-1/+1
|
* port simplejson upgrade from the trunk #4136Benjamin Peterson2009-05-021-330/+1377
| | | | | | json also now works only with unicode strings Patch by Antoine Pitrou; updated by me
* Merged revisions 66938,66942 via svnmerge fromBenjamin Peterson2008-10-161-4/+6
| | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r66938 | benjamin.peterson | 2008-10-16 16:27:54 -0500 (Thu, 16 Oct 2008) | 1 line fix possible ref leak ........ r66942 | benjamin.peterson | 2008-10-16 16:48:06 -0500 (Thu, 16 Oct 2008) | 1 line fix more possible ref leaks in _json and use Py_CLEAR ........
* merge r66932 and add a few py3k only checksBenjamin Peterson2008-10-161-4/+6
|
* #3560: cleanup C memoryview APIAntoine Pitrou2008-08-191-1/+1
|
* Merged revisions 65654 via svnmerge fromMartin v. Löwis2008-08-131-1/+1
| | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r65654 | martin.v.loewis | 2008-08-12 16:49:50 +0200 (Tue, 12 Aug 2008) | 6 lines Issue #3139: Make buffer-interface thread-safe wrt. PyArg_ParseTuple, by denying s# to parse objects that have a releasebuffer procedure, and introducing s*. More module might need to get converted to use s*. ........
* Merged revisions 65147 via svnmerge fromBenjamin Peterson2008-07-191-2/+10
| | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/trunk ........ r65147 | bob.ippolito | 2008-07-19 16:59:50 -0500 (Sat, 19 Jul 2008) | 1 line #3322: bounds checking for _json.scanstring ........
* Implement PEP 3121: new module initialization and finalization API.Martin v. Löwis2008-06-111-4/+15
|
* Renamed PyString to PyBytesChristian Heimes2008-05-261-18/+18
|
* Move variable declaration to the top of the block,Amaury Forgeot d'Arc2008-05-081-1/+2
| | | | to let _json.c compile with Microsoft compilers.
* Merged revisions 62734,62736,62748,62769 via svnmerge fromChristian Heimes2008-05-081-0/+620
svn+ssh://pythondev@svn.python.org/python/trunk ........ r62734 | brett.cannon | 2008-05-05 22:21:38 +0200 (Mon, 05 May 2008) | 5 lines Add the 'json' package. Code taken from simplejson 1.9 and contributed by Bob Ippolito. Closes issue #2750. ........ r62736 | georg.brandl | 2008-05-05 22:53:39 +0200 (Mon, 05 May 2008) | 2 lines Fix JSON module docs. ........ r62748 | benjamin.peterson | 2008-05-06 04:51:10 +0200 (Tue, 06 May 2008) | 2 lines PEP 8 nits in json package ........ r62769 | christian.heimes | 2008-05-06 18:18:41 +0200 (Tue, 06 May 2008) | 2 lines Intern static string Use float constructors instead of magic code for float constants ........
generated by cgit v0.12 at 2024-11-25 19:40:33 (GMT)