f95a1b3c53
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.
........
2010-05-09 15:52:27 +00:00
4fad6bdde9
Merged revisions 76710 via svnmerge from
...
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.
........
................
2009-12-08 16:00:03 +00:00
781eba7972
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.
........
2009-12-08 15:57:31 +00:00
491a4cb8d9
Fix TODO: do the sort by just the key, not the key/value pair.
2009-05-27 11:19:02 +00:00
bcf6f92dc5
* Fix-up a TODO (support the sort_key option).
...
* 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.
2009-05-27 09:58:34 +00:00
c8d952dfe4
Issue 6105: json encoder to respect iteration order of its inputs.
2009-05-27 06:50:31 +00:00
596820539f
Merged revisions 72314 via svnmerge from
...
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.
........
2009-05-05 07:52:05 +00:00
fecf5d143a
Fixed warning. (Should not use *const* as variable name)
2009-05-02 15:55:19 +00:00
c6b607d4a9
port simplejson upgrade from the trunk #4136
...
json also now works only with unicode strings
Patch by Antoine Pitrou; updated by me
2009-05-02 12:36:44 +00:00
8e8c2152fb
Merged revisions 66938,66942 via svnmerge from
...
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
........
2008-10-16 21:56:24 +00:00
a13d475901
merge r66932 and add a few py3k only checks
2008-10-16 21:17:24 +00:00
ee58fa484e
#3560 : cleanup C memoryview API
2008-08-19 18:22:14 +00:00
423be95dcf
Merged revisions 65654 via svnmerge from
...
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*.
........
2008-08-13 15:53:07 +00:00
7af6eec6d0
Merged revisions 65147 via svnmerge from
...
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
........
2008-07-19 22:26:35 +00:00
1a21451b1d
Implement PEP 3121: new module initialization and finalization API.
2008-06-11 05:26:20 +00:00
72b710a596
Renamed PyString to PyBytes
2008-05-26 13:28:38 +00:00
cb0cdce821
Move variable declaration to the top of the block,
...
to let _json.c compile with Microsoft compilers.
2008-05-08 20:56:43 +00:00
90540004d3
Merged revisions 62734,62736,62748,62769 via svnmerge from
...
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
........
2008-05-08 14:29:10 +00:00
Antoine Pitrou
Raymond Hettinger
Georg Brandl
Hirokazu Yamamoto
Benjamin Peterson
Martin v. Löwis
Christian Heimes
Amaury Forgeot d'Arc