Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								699cd9f7f1 
								
							 
						 
						
							
							
								
								Remove unused variable  
							
							
							
						 
						
							2011-10-11 04:06:47 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Martin v. Löwis 
								
							 
						 
						
							
							
							
							
								
							
							
								1ee1b6fe0d 
								
							 
						 
						
							
							
								
								Use identifier API for PyObject_GetAttrString.  
							
							
							
						 
						
							2011-10-10 18:11:30 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Martin v. Löwis 
								
							 
						 
						
							
							
							
							
								
							
							
								c47adb04b3 
								
							 
						 
						
							
							
								
								Change PyUnicode_KIND to 1,2,4. Drop _KIND_SIZE and _CHARACTER_SIZE.  
							
							
							
						 
						
							2011-10-07 20:55:35 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								90c30e87be 
								
							 
						 
						
							
							
								
								Remove now duplicate code in _json.c; instead, reuse the new private lib  
							
							
							
						 
						
							2011-10-06 19:09:51 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Martin v. Löwis 
								
							 
						 
						
							
							
							
							
								
							
							
								d63a3b8beb 
								
							 
						 
						
							
							
								
								Implement PEP 393.  
							
							
							
						 
						
							2011-09-28 07:41:54 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								18bb330203 
								
							 
						 
						
							
							
								
								Fix compilation under Windows  
							
							
							
						 
						
							2011-08-20 03:19:34 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								df7fc9dda7 
								
							 
						 
						
							
							
								
								Issue  #12778 : Reduce memory consumption when JSON-encoding a large container of many small objects.  
							
							
							
						 
						
							2011-08-19 18:03:14 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ezio Melotti 
								
							 
						 
						
							
							
							
							
								
							
							
								f8d6fd605d 
								
							 
						 
						
							
							
								
								#12051 : merge with 3.2.  
							
							
							
						 
						
							2011-05-11 01:23:41 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ezio Melotti 
								
							 
						 
						
							
							
							
							
								
							
							
								f188bc5d46 
								
							 
						 
						
							
							
								
								#12051 : merge with 3.1.  
							
							
							
						 
						
							2011-05-11 01:10:27 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ezio Melotti 
								
							 
						 
						
							
							
							
							
								
							
							
								136726537f 
								
							 
						 
						
							
							
								
								#12051 : Fix segfault in json.dumps() while encoding highly-nested objects using the C accelerations.  
							
							
							
						 
						
							2011-05-11 01:02:56 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ezio Melotti 
								
							 
						 
						
							
							
							
							
								
							
							
								9c18778695 
								
							 
						 
						
							
							
								
								#12017 : merge with 3.2.  
							
							
							
						 
						
							2011-05-07 18:29:14 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ezio Melotti 
								
							 
						 
						
							
							
							
							
								
							
							
								06383ee090 
								
							 
						 
						
							
							
								
								#12017 : merge with 3.1.  
							
							
							
						 
						
							2011-05-07 18:15:34 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ezio Melotti 
								
							 
						 
						
							
							
							
							
								
							
							
								362b95102f 
								
							 
						 
						
							
							
								
								#12017 : Fix segfault in json.loads() while decoding highly-nested objects using the C accelerations.  
							
							
							
						 
						
							2011-05-07 17:58:09 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								f645451d78 
								
							 
						 
						
							
							
								
								Issue  #11856 : Speed up parsing of JSON numbers.  
							
							
							
						 
						
							2011-04-25 19:16:06 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Brett Cannon 
								
							 
						 
						
							
							
							
							
								
							
							
								b94767ff44 
								
							 
						 
						
							
							
								
								Issue  #8914 : fix various warnings from the Clang static analyzer v254.  
							
							
							
						 
						
							2011-02-22 20:15:44 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								2397dd58b7 
								
							 
						 
						
							
							
								
								Issue  #10314 : improve performance of JSON encoding with sort_keys=True  
							
							
							
						 
						
							2010-11-04 16:51:32 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								ae136da881 
								
							 
						 
						
							
							
								
								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:26:41 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								5b0e9e84e9 
								
							 
						 
						
							
							
								
								Issue  #10055 : Make json C89-compliant in UCS4 mode.  
							
							
							
						 
						
							2010-10-09 15:24:28 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Georg Brandl 
								
							 
						 
						
							
							
							
							
								
							
							
								4009c9edfc 
								
							 
						 
						
							
							
								
								Merged revisions 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.
........ 
							
						 
						
							2010-10-06 08:26:09 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								7d6e076f6d 
								
							 
						 
						
							
							
								
								Issue  #7451 : Improve decoding performance of JSON objects, and reduce  
							
							... 
							
							
							
							the memory consumption of said decoded objects when they use the same
strings as keys. 
							
						 
						
							2010-09-04 20:16:53 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Georg Brandl 
								
							 
						 
						
							
							
							
							
								
							
							
								c8284cfc57 
								
							 
						 
						
							
							
								
								#9087 : update json docstrings -- unicode and long do not exist anymore.  
							
							
							
						 
						
							2010-08-02 20:16:18 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Doug Hellmann 
								
							 
						 
						
							
							
							
							
								
							
							
								76e57947a1 
								
							 
						 
						
							
							
								
								Merged revisions 83016 via svnmerge from  
							
							... 
							
							
							
							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
........ 
							
						 
						
							2010-07-21 12:35:38 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Doug Hellmann 
								
							 
						 
						
							
							
							
							
								
							
							
								1c524754f6 
								
							 
						 
						
							
							
								
								Apply patch from Ray Allen for issue 9296  
							
							
							
						 
						
							2010-07-21 12:29:04 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								7f14f0d8a0 
								
							 
						 
						
							
							
								
								Recorded merge of revisions 81032 via svnmerge from  
							
							... 
							
							
							
							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.
  ........
................ 
							
						 
						
							2010-05-09 16:14:21 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Raymond Hettinger 
								
							 
						 
						
							
							
							
							
								
							
							
								491a4cb8d9 
								
							 
						 
						
							
							
								
								Fix TODO: do the sort by just the key, not the key/value pair.  
							
							
							
						 
						
							2009-05-27 11:19:02 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Raymond Hettinger 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Raymond Hettinger 
								
							 
						 
						
							
							
							
							
								
							
							
								c8d952dfe4 
								
							 
						 
						
							
							
								
								Issue 6105: json encoder to respect iteration order of its inputs.  
							
							
							
						 
						
							2009-05-27 06:50:31 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Georg Brandl 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Hirokazu Yamamoto 
								
							 
						 
						
							
							
							
							
								
							
							
								fecf5d143a 
								
							 
						 
						
							
							
								
								Fixed warning. (Should not use *const* as variable name)  
							
							
							
						 
						
							2009-05-02 15:55:19 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Benjamin Peterson 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Benjamin Peterson 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Benjamin Peterson 
								
							 
						 
						
							
							
							
							
								
							
							
								a13d475901 
								
							 
						 
						
							
							
								
								merge r66932 and add a few py3k only checks  
							
							
							
						 
						
							2008-10-16 21:17:24 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								ee58fa484e 
								
							 
						 
						
							
							
								
								#3560 : cleanup C memoryview API  
							
							
							
						 
						
							2008-08-19 18:22:14 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Martin v. Löwis 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Benjamin Peterson 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Martin v. Löwis 
								
							 
						 
						
							
							
							
							
								
							
							
								1a21451b1d 
								
							 
						 
						
							
							
								
								Implement PEP 3121: new module initialization and finalization API.  
							
							
							
						 
						
							2008-06-11 05:26:20 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Heimes 
								
							 
						 
						
							
							
							
							
								
							
							
								72b710a596 
								
							 
						 
						
							
							
								
								Renamed PyString to PyBytes  
							
							
							
						 
						
							2008-05-26 13:28:38 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Amaury Forgeot d'Arc 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Heimes 
								
							 
						 
						
							
							
							
							
								
							
							
								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