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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Benjamin Peterson 
								
							 
						 
						
							
							
							
							
								
							
							
								c9c0f201fe 
								
							 
						 
						
							
							
								
								convert old fail* assertions to assert*  
							
							
							
						 
						
							2009-06-30 23:06:06 +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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Raymond Hettinger 
								
							 
						 
						
							
							
							
							
								
							
							
								0ad98d8509 
								
							 
						 
						
							
							
								
								Forward port r70471: Add object_pairs_hook.  Issue 5381.  
							
							
							
						 
						
							2009-04-21 03:09:17 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Benjamin Peterson 
								
							 
						 
						
							
							
							
							
								
							
							
								a13d475901 
								
							 
						 
						
							
							
								
								merge r66932 and add a few py3k only checks  
							
							
							
						 
						
							2008-10-16 21:17:24 +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