Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								7a616f2fc5 
								
							 
						 
						
							
							
								
								Issue  #12065 : connect_ex() on an SSL socket now returns the original errno  
							
							... 
							
							
							
							when the socket's timeout expires (it used to return None). 
							
						 
						
							2011-05-18 18:52:20 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								b4410dbea6 
								
							 
						 
						
							
							
								
								Issue  #12065 : connect_ex() on an SSL socket now returns the original errno  
							
							... 
							
							
							
							when the socket's timeout expires (it used to return None). 
							
						 
						
							2011-05-18 18:51:06 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								cc9ca223d6 
								
							 
						 
						
							
							
								
								Also protect ehlo() and quit() with the transient_internet() context manager  
							
							
							
						 
						
							2011-05-18 18:04:04 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								e065020680 
								
							 
						 
						
							
							
								
								Issue  #8809 : The SMTP_SSL constructor and SMTP.starttls() now support  
							
							... 
							
							
							
							passing a `context` argument pointing to an ssl.SSLContext instance.
Patch by Kasun Herath. 
							
						 
						
							2011-05-18 18:03:09 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								5f3b1c4979 
								
							 
						 
						
							
							
								
								(Merge 3.2) Issue  #12096 : Fix a race condition in  
							
							... 
							
							
							
							test_threading.test_waitfor(). Patch written by Charles-François Natali. 
							
						 
						
							2011-05-18 00:20:18 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								3349bca46d 
								
							 
						 
						
							
							
								
								Issue  #12096 : Fix a race condition in test_threading.test_waitfor(). Patch  
							
							... 
							
							
							
							written by Charles-François Natali. 
							
						 
						
							2011-05-18 00:16:14 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								bd3d5cf96a 
								
							 
						 
						
							
							
								
								Skip some tests in the absence of multiprocessing.  
							
							
							
						 
						
							2011-05-17 07:41:18 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vinay Sajip 
								
							 
						 
						
							
							
							
							
								
							
							
								ce7c978140 
								
							 
						 
						
							
							
								
								Skip some more tests in the absence of threading.  
							
							
							
						 
						
							2011-05-17 07:15:53 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								362ce37963 
								
							 
						 
						
							
							
								
								(Merge 3.2) Issue  #11614 : Fix test_linecache, cjkencodings_test.py doesn't  
							
							... 
							
							
							
							exist anymore 
							
						 
						
							2011-05-16 17:20:47 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								e5720b989f 
								
							 
						 
						
							
							
								
								(Merge 3.1) Issue  #11614 : Fix test_linecache, cjkencodings_test.py doesn't  
							
							... 
							
							
							
							exist anymore 
							
						 
						
							2011-05-16 17:20:07 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								e98f177ca6 
								
							 
						 
						
							
							
								
								Issue  #11614 : Fix test_linecache, cjkencodings_test.py doesn't exist anymore  
							
							
							
						 
						
							2011-05-16 17:18:51 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								651e1a2e63 
								
							 
						 
						
							
							
								
								(Merge 3.2) Issue  #12057 : Convert CJK encoding testcase BLOB into multiple text  
							
							... 
							
							
							
							files 
							
						 
						
							2011-05-16 16:50:23 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								b67cf161bc 
								
							 
						 
						
							
							
								
								(Merge 3.1) Issue  #12057 : Convert CJK encoding testcase BLOB into multiple text  
							
							... 
							
							
							
							files 
							
						 
						
							2011-05-16 16:45:15 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								033a543ab1 
								
							 
						 
						
							
							
								
								Issue  #12057 : Convert CJK encoding testcase BLOB into multiple text files  
							
							
							
						 
						
							2011-05-16 16:43:38 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								118ed71afe 
								
							 
						 
						
							
							
								
								(Merge 3.2) Issue  #11614 : import __hello__ prints "Hello World!". Patch written  
							
							... 
							
							
							
							by Andreas Stührk. 
							
						 
						
							2011-05-16 16:35:35 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								9cd6626f3d 
								
							 
						 
						
							
							
								
								(Merge 3.1) Issue  #11614 : import __hello__ prints "Hello World!". Patch written  
							
							... 
							
							
							
							by Andreas Stührk. 
							
						 
						
							2011-05-16 16:32:33 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								c77b931196 
								
							 
						 
						
							
							
								
								Issue  #11614 : import __hello__ prints "Hello World!". Patch written by Andreas  
							
							... 
							
							
							
							Stührk. 
							
						 
						
							2011-05-16 16:29:35 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								d0e11ec5b0 
								
							 
						 
						
							
							
								
								Issue  #10756 : atexit normalizes the exception before displaying it. Patch by  
							
							... 
							
							
							
							Andreas Stührk.
Backport a fix already applied to Python 3.2+ (4a82be47a948 + 5060a92a8597). 
							
						 
						
							2011-05-15 18:57:44 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ronald Oussoren 
								
							 
						 
						
							
							
							
							
								
							
							
								f4542eb433 
								
							 
						 
						
							
							
								
								(merge from 3.2) Issue  #9516 : avoid errors in sysconfig when MACOSX_DEPLOYMENT_TARGET is set in shell.  
							
							... 
							
							
							
							Without this patch python will fail to start properly when the environment
variable MACOSX_DEPLOYMENT_TARGET is set on MacOSX and has a value that is
not compatible with the value during Python's build. This is caused by code
in sysconfig that was only meant to be used in disutils. 
							
						 
						
							2011-05-15 17:13:47 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ronald Oussoren 
								
							 
						 
						
							
							
							
							
								
							
							
								222e89a598 
								
							 
						 
						
							
							
								
								Issue  #9516 : avoid errors in sysconfig when MACOSX_DEPLOYMENT_TARGET is set in shell.  
							
							... 
							
							
							
							Without this patch python will fail to start properly when the environment
variable MACOSX_DEPLOYMENT_TARGET is set on MacOSX and has a value that is
not compatible with the value during Python's build. This is caused by code
in sysconfig that was only meant to be used in disutils. 
							
						 
						
							2011-05-15 16:46:11 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Gregory P. Smith 
								
							 
						 
						
							
							
							
							
								
							
							
								5ed2e779f1 
								
							 
						 
						
							
							
								
								Issue  #1746656 : Add if_nameindex, if_nametoindex, if_indextoname  
							
							... 
							
							
							
							methods to the socket module. 
							
						 
						
							2011-05-15 00:26:45 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Nadeem Vawda 
								
							 
						 
						
							
							
							
							
								
							
							
								beb552c97c 
								
							 
						 
						
							
							
								
								Merge: Fix copy-paste mistake in new zlib test.  
							
							
							
						 
						
							2011-05-15 00:49:20 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Nadeem Vawda 
								
							 
						 
						
							
							
							
							
								
							
							
								760155cc52 
								
							 
						 
						
							
							
								
								Merge: Fix copy-paste mistake in new zlib test.  
							
							
							
						 
						
							2011-05-15 00:48:57 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Nadeem Vawda 
								
							 
						 
						
							
							
							
							
								
							
							
								1161a9ca40 
								
							 
						 
						
							
							
								
								Fix copy-paste mistake in new zlib test.  
							
							
							
						 
						
							2011-05-15 00:48:24 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Gregory P. Smith 
								
							 
						 
						
							
							
							
							
								
							
							
								11ddc999e0 
								
							 
						 
						
							
							
								
								merge heads  
							
							
							
						 
						
							2011-05-14 15:33:43 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Gregory P. Smith 
								
							 
						 
						
							
							
							
							
								
							
							
								ec075e6479 
								
							 
						 
						
							
							
								
								merge heads  
							
							
							
						 
						
							2011-05-14 15:32:19 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Gregory P. Smith 
								
							 
						 
						
							
							
							
							
								
							
							
								873cab2890 
								
							 
						 
						
							
							
								
								merge heads.  
							
							
							
						 
						
							2011-05-14 15:26:35 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Nadeem Vawda 
								
							 
						 
						
							
							
							
							
								
							
							
								ccb33bf002 
								
							 
						 
						
							
							
								
								Merge:  #8650 : Make zlib.[de]compressobj().[de]compress() 64-bit clean.  
							
							... 
							
							
							
							Raise an OverflowError if the input data is too large, instead of silently
truncating the input and returning an incorrect result. 
							
						 
						
							2011-05-15 00:23:40 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Nadeem Vawda 
								
							 
						 
						
							
							
							
							
								
							
							
								565d659dcd 
								
							 
						 
						
							
							
								
								Merge:  #8650 : Make zlib.[de]compressobj().[de]compress() 64-bit clean.  
							
							... 
							
							
							
							Raise an OverflowError if the input data is too large, instead of silently
truncating the input and returning an incorrect result. 
							
						 
						
							2011-05-15 00:20:52 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Nadeem Vawda 
								
							 
						 
						
							
							
							
							
								
							
							
								0c3d96ae1d 
								
							 
						 
						
							
							
								
								Issue  #8650 : Make zlib.[de]compressobj().[de]compress() 64-bit clean.  
							
							... 
							
							
							
							Raise an OverflowError if the input data is too large, instead of silently
truncating the input and returning an incorrect result. 
							
						 
						
							2011-05-15 00:19:50 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Gregory P. Smith 
								
							 
						 
						
							
							
							
							
								
							
							
								79aa5bf5ed 
								
							 
						 
						
							
							
								
								Fixes Issue  #12059 : Properly handle missing hash functions even when  
							
							... 
							
							
							
							the expected builtin modules are not present.
This includes a unittest for __get_builtin_constructor() in the face
of such an error. 
							
						 
						
							2011-05-14 15:15:49 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Gregory P. Smith 
								
							 
						 
						
							
							
							
							
								
							
							
								12c9d028ed 
								
							 
						 
						
							
							
								
								Fixes Issue  #12059 : Properly handle missing hash functions even when  
							
							... 
							
							
							
							the expected builtin modules are not present.
This includes a unittest for __get_builtin_constructor() in the face
of such an error. 
							
						 
						
							2011-05-14 15:15:49 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Nadeem Vawda 
								
							 
						 
						
							
							
							
							
								
							
							
								905cca011b 
								
							 
						 
						
							
							
								
								Merge fix for memory leaks in zlib.compress() and .decompress().  
							
							... 
							
							
							
							Also, make sure that test_zlib tests decompress() for overly-large inputs. 
							
						 
						
							2011-05-14 23:18:07 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Nadeem Vawda 
								
							 
						 
						
							
							
							
							
								
							
							
								154bdf92fc 
								
							 
						 
						
							
							
								
								Fix memory leaks in zlib.compress() and .decompress().  
							
							... 
							
							
							
							Also, make sure that test_zlib tests decompress() for overly-large inputs. 
							
						 
						
							2011-05-14 23:07:36 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Nadeem Vawda 
								
							 
						 
						
							
							
							
							
								
							
							
								1b8a417d9f 
								
							 
						 
						
							
							
								
								Issue  #8650 : Backport 64-bit safety fixes for compress() and decompress().  
							
							
							
						 
						
							2011-05-14 22:26:55 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Nadeem Vawda 
								
							 
						 
						
							
							
							
							
								
							
							
								9c405c470b 
								
							 
						 
						
							
							
								
								Merge:  #12050 : zlib.decompressobj().decompress() now clears the unconsumed_tail  
							
							... 
							
							
							
							attribute when called without a max_length argument. 
							
						 
						
							2011-05-14 14:19:56 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Nadeem Vawda 
								
							 
						 
						
							
							
							
							
								
							
							
								5eef502de0 
								
							 
						 
						
							
							
								
								Merge:  #12050 : zlib.decompressobj().decompress() now clears the unconsumed_tail  
							
							... 
							
							
							
							attribute when called without a max_length argument. 
							
						 
						
							2011-05-14 14:15:47 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Nadeem Vawda 
								
							 
						 
						
							
							
							
							
								
							
							
								7619e88adb 
								
							 
						 
						
							
							
								
								Issue  #12050 : zlib.decompressobj().decompress() now clears the unconsumed_tail  
							
							... 
							
							
							
							attribute when called without a max_length argument. 
							
						 
						
							2011-05-14 14:05:20 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ezio Melotti 
								
							 
						 
						
							
							
							
							
								
							
							
								63db5b6510 
								
							 
						 
						
							
							
								
								Merge with 3.2 and also remove captured_output from __all__ (see  #7960 ).  
							
							
							
						 
						
							2011-05-14 14:57:15 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ezio Melotti 
								
							 
						 
						
							
							
							
							
								
							
							
								07352b084c 
								
							 
						 
						
							
							
								
								Update __all__ and docstring.  
							
							
							
						 
						
							2011-05-14 14:51:18 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ezio Melotti 
								
							 
						 
						
							
							
							
							
								
							
							
								c3afbb9542 
								
							 
						 
						
							
							
								
								Skip test in test_fileinput when zlib is missing.  
							
							
							
						 
						
							2011-05-14 10:10:53 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ezio Melotti 
								
							 
						 
						
							
							
							
							
								
							
							
								6b8934053a 
								
							 
						 
						
							
							
								
								#7960 : merge with 3.2.  
							
							
							
						 
						
							2011-05-14 08:44:12 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ezio Melotti 
								
							 
						 
						
							
							
							
							
								
							
							
								e728d72d8a 
								
							 
						 
						
							
							
								
								#7960 : merge with 3.1.  
							
							
							
						 
						
							2011-05-14 08:43:25 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ezio Melotti 
								
							 
						 
						
							
							
							
							
								
							
							
								fc778fd067 
								
							 
						 
						
							
							
								
								#7960 : fix docstrings for captured_output and captured_stdout.  
							
							
							
						 
						
							2011-05-14 08:22:47 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ezio Melotti 
								
							 
						 
						
							
							
							
							
								
							
							
								32e3fdc2d0 
								
							 
						 
						
							
							
								
								#5723 : merge with 3.2.  
							
							
							
						 
						
							2011-05-14 06:52:55 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ezio Melotti 
								
							 
						 
						
							
							
							
							
								
							
							
								6b60fb9148 
								
							 
						 
						
							
							
								
								#5723 : merge with 3.1.  
							
							
							
						 
						
							2011-05-14 06:47:51 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ezio Melotti 
								
							 
						 
						
							
							
							
							
								
							
							
								3c0d8a1cc7 
								
							 
						 
						
							
							
								
								#5723 : Improve json tests to be executed with and without accelerations.  
							
							
							
						 
						
							2011-05-14 06:38:03 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ezio Melotti 
								
							 
						 
						
							
							
							
							
								
							
							
								4e03e9dc8d 
								
							 
						 
						
							
							
								
								Merge with 3.2.  
							
							
							
						 
						
							2011-05-14 06:24:18 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ezio Melotti 
								
							 
						 
						
							
							
							
							
								
							
							
								3659f27ad3 
								
							 
						 
						
							
							
								
								Merge with 3.1.  
							
							
							
						 
						
							2011-05-14 06:23:20 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ezio Melotti 
								
							 
						 
						
							
							
							
							
								
							
							
								fec3ad1036 
								
							 
						 
						
							
							
								
								Change import_fresh_module to work with packages.  
							
							
							
						 
						
							2011-05-14 06:02:25 +03:00