Benjamin Peterson 
								
							 
						 
						
							
							
							
							
								
							
							
								88abdef02b 
								
							 
						 
						
							
							
								
								merge 3.4 ( #24094 )  
							
							
							
						 
						
							2015-05-02 22:37:13 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Benjamin Peterson 
								
							 
						 
						
							
							
							
							
								
							
							
								122f4b1bda 
								
							 
						 
						
							
							
								
								merge 3.3 ( #24094 )  
							
							
							
						 
						
							2015-05-02 22:36:26 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Benjamin Peterson 
								
							 
						 
						
							
							
							
							
								
							
							
								501182a47b 
								
							 
						 
						
							
							
								
								just sort the items tuple directly ( closes   #24094 )  
							
							
							
						 
						
							2015-05-02 22:28:04 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								f024d263b4 
								
							 
						 
						
							
							
								
								Issue  #23685 : Fix usage of PyMODINIT_FUNC in _json, _scproxy, nis, pyexpat  
							
							... 
							
							
							
							_codecs_cn, _codecs_hk, _codecs_iso2022, _codecs_jp, _codecs_kr and _codecs_tw
modules.
pyexpat.c doesn't need to redeclare PyMODINIT_FUNC, it's already declared in
Include/pyport.h. 
							
						 
						
							2015-03-17 17:48:27 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Serhiy Storchaka 
								
							 
						 
						
							
							
							
							
								
							
							
								483405bcca 
								
							 
						 
						
							
							
								
								Issue  #22883 : Got rid of outdated references to PyInt and PyString in comments.  
							
							
							
						 
						
							2015-02-17 10:14:30 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Benjamin Peterson 
								
							 
						 
						
							
							
							
							
								
							
							
								71cf91cc09 
								
							 
						 
						
							
							
								
								merge 3.4 ( #23369 )  
							
							
							
						 
						
							2015-02-01 18:00:19 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Benjamin Peterson 
								
							 
						 
						
							
							
							
							
								
							
							
								3675cd9db1 
								
							 
						 
						
							
							
								
								merge 3.3 ( #23369 )  
							
							
							
						 
						
							2015-02-01 17:59:49 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Benjamin Peterson 
								
							 
						 
						
							
							
							
							
								
							
							
								e3bfe19358 
								
							 
						 
						
							
							
								
								fix possible overflow in encode_basestring_ascii ( closes   #23369 )  
							
							
							
						 
						
							2015-02-01 17:53:53 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Serhiy Storchaka 
								
							 
						 
						
							
							
							
							
								
							
							
								47efb4a5dc 
								
							 
						 
						
							
							
								
								Issue  #19361 : JSON decoder now raises JSONDecodeError instead of ValueError.  
							
							
							
						 
						
							2015-01-26 13:16:30 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								dc3eaa80d4 
								
							 
						 
						
							
							
								
								Issue  #23206 : Make `json.dumps(..., ensure_ascii=False) as fast as the default case of ensure_ascii=True`.  Patch by Naoki Inada.  
							
							
							
						 
						
							2015-01-11 16:41:01 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								31a3ec313d 
								
							 
						 
						
							
							
								
								Issue  #22338 : Fix a crash in the json module on memory allocation failure.  
							
							
							
						 
						
							2014-09-10 23:31:42 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Benjamin Peterson 
								
							 
						 
						
							
							
							
							
								
							
							
								70d92a96ab 
								
							 
						 
						
							
							
								
								merge 3.3  
							
							
							
						 
						
							2014-04-14 11:48:21 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Benjamin Peterson 
								
							 
						 
						
							
							
							
							
								
							
							
								9beee049b0 
								
							 
						 
						
							
							
								
								merge 3.2  
							
							
							
						 
						
							2014-04-14 11:46:51 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Benjamin Peterson 
								
							 
						 
						
							
							
							
							
								
							
							
								6ef2b36afa 
								
							 
						 
						
							
							
								
								disallow a negative idx parameter  
							
							
							
						 
						
							2014-04-14 11:45:21 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Benjamin Peterson 
								
							 
						 
						
							
							
							
							
								
							
							
								584f5cbf16 
								
							 
						 
						
							
							
								
								merge 3.3  
							
							
							
						 
						
							2014-04-13 22:31:42 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Benjamin Peterson 
								
							 
						 
						
							
							
							
							
								
							
							
								156285c35f 
								
							 
						 
						
							
							
								
								merge 3.2  
							
							
							
						 
						
							2014-04-13 22:28:16 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Benjamin Peterson 
								
							 
						 
						
							
							
							
							
								
							
							
								99b5afab74 
								
							 
						 
						
							
							
								
								in scan_once, prevent the reading of arbitrary memory when passed a negative index  
							
							... 
							
							
							
							Bug reported by Guido Vranken. 
							
						 
						
							2014-04-13 22:10:38 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Serhiy Storchaka 
								
							 
						 
						
							
							
							
							
								
							
							
								687ff0ecdf 
								
							 
						 
						
							
							
								
								Issue  #11489 : JSON decoder now accepts lone surrogates.  
							
							
							
						 
						
							2013-11-26 21:27:11 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Serhiy Storchaka 
								
							 
						 
						
							
							
							
							
								
							
							
								c93329b3dd 
								
							 
						 
						
							
							
								
								Issue  #11489 : JSON decoder now accepts lone surrogates.  
							
							
							
						 
						
							2013-11-26 21:25:28 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ethan Furman 
								
							 
						 
						
							
							
							
							
								
							
							
								a4998a7041 
								
							 
						 
						
							
							
								
								Close   #18264 : int- and float-derived enums now converted to int or float.  
							
							
							
						 
						
							2013-08-10 13:01:45 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Heimes 
								
							 
						 
						
							
							
							
							
								
							
							
								75e923fcf2 
								
							 
						 
						
							
							
								
								Issue  #16847 : Fixed improper use of _PyUnicode_CheckConsistency() in  
							
							... 
							
							
							
							non-pydebug builds. Several extension modules now compile cleanly when
assert()s are enabled in standard builds (-DDEBUG flag). 
							
						 
						
							2013-01-03 09:22:41 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Heimes 
								
							 
						 
						
							
							
							
							
								
							
							
								f402e922f3 
								
							 
						 
						
							
							
								
								Issue  #16847 : Fixed improper use of _PyUnicode_CheckConsistency() in  
							
							... 
							
							
							
							non-pydebug builds. Several extension modules now compile cleanly when
assert()s are enabled in standard builds (-DDEBUG flag). 
							
						 
						
							2013-01-03 09:21:55 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ezio Melotti 
								
							 
						 
						
							
							
							
							
								
							
							
								37623ab5f1 
								
							 
						 
						
							
							
								
								#16009 : JSON error messages now provide more information.  Patch by Serhiy Storchaka.  
							
							
							
						 
						
							2013-01-03 08:44:15 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								cbb028466b 
								
							 
						 
						
							
							
								
								Issue  #16590 : remove obsolete compatibility code from the _json module.  
							
							... 
							
							
							
							Patch by Serhiy Storchaka. 
							
						 
						
							2012-12-01 19:34:16 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								53d36b6912 
								
							 
						 
						
							
							
								
								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:03:30 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								5ebe65f8cb 
								
							 
						 
						
							
							
								
								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 19:59:21 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								9f69e79c45 
								
							 
						 
						
							
							
								
								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 19:52:06 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								76df43de30 
								
							 
						 
						
							
							
								
								Issue  #16330 : Use surrogate-related macros  
							
							... 
							
							
							
							Patch written by Serhiy Storchaka. 
							
						 
						
							2012-10-30 01:42:39 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								802d669044 
								
							 
						 
						
							
							
								
								Issue  #5067 : improve some json error messages.  
							
							... 
							
							
							
							Patch by Serhiy Storchaka. 
							
						 
						
							2012-06-29 01:59:54 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								2d24e94bbe 
								
							 
						 
						
							
							
								
								Issue  #5067 : improve some json error messages.  
							
							... 
							
							
							
							Patch by Serhiy Storchaka. 
							
						 
						
							2012-06-29 01:58:26 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								8f825060f1 
								
							 
						 
						
							
							
								
								Check newly created consistency using _PyUnicode_CheckConsistency(str, 1)  
							
							... 
							
							
							
							* In debug mode, fill the string data with invalid characters
 * Simplify also reference counting in PyCodec_BackslashReplaceErrors()
   and PyCodec_XMLCharRefReplaceError() 
							
						 
						
							2012-04-27 13:55:39 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								d0acb411ef 
								
							 
						 
						
							
							
								
								Issue  #14387 : Do not include accu.h from Python.h.  
							
							
							
						 
						
							2012-03-22 14:42:18 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								f5cff56a1b 
								
							 
						 
						
							
							
								
								Issue  #13088 : Add shared Py_hexdigits constant to format a number into base 16  
							
							
							
						 
						
							2011-10-14 02:13:11 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								d9c0631d77 
								
							 
						 
						
							
							
								
								Strip trailing spaces in _json.c  
							
							
							
						 
						
							2011-10-11 21:56:19 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								c4f281eba3 
								
							 
						 
						
							
							
								
								Fix misuse of PyUnicode_GET_SIZE, use PyUnicode_GET_LENGTH instead  
							
							
							
						 
						
							2011-10-11 22:11:42 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									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