Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								d2eca37cc5 
								
							 
						 
						
							
							
								
								Clean up socket closing in test_ssl and test.ssl_servers  
							
							
							
						 
						
							2010-10-29 23:41:37 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Georg Brandl 
								
							 
						 
						
							
							
							
							
								
							
							
								b75b639a8b 
								
							 
						 
						
							
							
								
								Remove usage of exception indexing.  
							
							
							
						 
						
							2010-10-24 14:20:22 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								eb585adbde 
								
							 
						 
						
							
							
								
								Fix test_ssl on Ubuntu buildbot with patched OpenSSL  
							
							
							
						 
						
							2010-10-22 18:24:20 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								d532321f7b 
								
							 
						 
						
							
							
								
								Issue  #5639 : Add a *server_hostname* argument to SSLContext.wrap_socket  
							
							... 
							
							
							
							in order to support the TLS SNI extension.  `HTTPSConnection` and
`urlopen()` also use this argument, so that HTTPS virtual hosts are now
supported. 
							
						 
						
							2010-10-22 18:19:07 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								05d936d2ce 
								
							 
						 
						
							
							
								
								Let test_ssl fail gracefully if ssl support is not available  
							
							
							
						 
						
							2010-10-13 11:38:36 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								803e6d670c 
								
							 
						 
						
							
							
								
								Issue  #9003 : http.client.HTTPSConnection, urllib.request.HTTPSHandler and  
							
							... 
							
							
							
							urllib.request.urlopen now take optional arguments to allow for
server certificate checking, as recommended in public uses of HTTPS. 
							
						 
						
							2010-10-13 10:36:15 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								b0182c8ca5 
								
							 
						 
						
							
							
								
								Issue  #10075 : Add a session_stats() method to SSLContext objects.  
							
							
							
						 
						
							2010-10-12 20:09:02 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								81564093a1 
								
							 
						 
						
							
							
								
								Issue  #1051 : Add a script (Lib/test/make_ssl_certs.py) to generate the  
							
							... 
							
							
							
							custom certificate and private key files used by SSL-related certs. 
							
						 
						
							2010-10-08 23:06:24 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								59fdd6736b 
								
							 
						 
						
							
							
								
								Issue  #1589 : Add ssl.match_hostname(), to help implement server identity  
							
							... 
							
							
							
							verification for higher-level protocols. 
							
						 
						
							2010-10-08 10:37:08 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Giampaolo RodolĂ  
								
							 
						 
						
							
							
							
							
								
							
							
								977c707b42 
								
							 
						 
						
							
							
								
								Fix issue 6706: adds new handle_accepted() method to asyncore.dispatcher  
							
							
							
						 
						
							2010-10-04 21:08:36 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								5974cdd5f5 
								
							 
						 
						
							
							
								
								Merged revisions 84807 via svnmerge from  
							
							... 
							
							
							
							svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
  r84807 | antoine.pitrou | 2010-09-14 16:43:44 +0200 (mar., 14 sept. 2010) | 4 lines
  Issue #9853 : Fix the signature of SSLSocket.recvfrom() and
  SSLSocket.sendto() to match the corresponding socket methods.
........ 
							
						 
						
							2010-09-14 14:47:08 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								a468adc76d 
								
							 
						 
						
							
							
								
								Issue  #9853 : Fix the signature of SSLSocket.recvfrom() and  
							
							... 
							
							
							
							SSLSocket.sendto() to match the corresponding socket methods. 
							
						 
						
							2010-09-14 14:43:44 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								78d8946d19 
								
							 
						 
						
							
							
								
								Merged revisions 84650 via svnmerge from  
							
							... 
							
							
							
							svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
  r84650 | antoine.pitrou | 2010-09-09 15:31:46 +0200 (jeu., 09 sept. 2010) | 4 lines
  Use transient_internet() where appropriate in test_ssl
  (svn.python.org is sometimes unavailable)
........ 
							
						 
						
							2010-09-09 13:33:33 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								350c7229be 
								
							 
						 
						
							
							
								
								Use transient_internet() where appropriate in test_ssl  
							
							... 
							
							
							
							(svn.python.org is sometimes unavailable) 
							
						 
						
							2010-09-09 13:31:46 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								4d7979be72 
								
							 
						 
						
							
							
								
								Merged revisions 84597-84599 via svnmerge from  
							
							... 
							
							
							
							svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
  r84597 | antoine.pitrou | 2010-09-07 22:42:19 +0200 (mar., 07 sept. 2010) | 5 lines
  Issue #8574 : better implementation of test.support.transient_internet().
  Original patch by Victor.
........
  r84598 | antoine.pitrou | 2010-09-07 23:05:49 +0200 (mar., 07 sept. 2010) | 6 lines
  Issue #9792 : In case of connection failure, socket.create_connection()
  would swallow the exception and raise a new one, making it impossible
  to fetch the original errno, or to filter timeout errors.  Now the
  original error is re-raised.
........
  r84599 | antoine.pitrou | 2010-09-07 23:09:09 +0200 (mar., 07 sept. 2010) | 4 lines
  Improve transient_internet() again to detect more network errors,
  and use it in test_robotparser. Fixes  #8574 .
........ 
							
						 
						
							2010-09-07 21:22:56 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								a88c83cbab 
								
							 
						 
						
							
							
								
								Issue  #8574 : better implementation of test.support.transient_internet().  
							
							... 
							
							
							
							Original patch by Victor. 
							
						 
						
							2010-09-07 20:42:19 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Giampaolo RodolĂ  
								
							 
						 
						
							
							
							
							
								
							
							
								8b7da623ce 
								
							 
						 
						
							
							
								
								Fix issue  #9711 : raise ValueError is SSLConnection constructor is invoked with keyfile and not certfile.  
							
							
							
						 
						
							2010-08-30 18:28:05 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Giampaolo RodolĂ  
								
							 
						 
						
							
							
							
							
								
							
							
								4a656ebe05 
								
							 
						 
						
							
							
								
								dedent some lines in test_ssl so that they are actually executed  
							
							
							
						 
						
							2010-08-29 22:50:39 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Giampaolo RodolĂ  
								
							 
						 
						
							
							
							
							
								
							
							
								cd9dfb919a 
								
							 
						 
						
							
							
								
								in ssl tests rely on IOError.errno rather thanf IOError.strerror for better compatibility across platforms.  
							
							
							
						 
						
							2010-08-29 20:56:56 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Giampaolo RodolĂ  
								
							 
						 
						
							
							
							
							
								
							
							
								745ab3807e 
								
							 
						 
						
							
							
								
								Fix issue issue9706: provides a better error handling for various SSL operations  
							
							
							
						 
						
							2010-08-29 19:25:49 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								982c018b32 
								
							 
						 
						
							
							
								
								Remove debug hack  
							
							
							
						 
						
							2010-08-16 14:33:42 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								ed9863685f 
								
							 
						 
						
							
							
								
								Add debug output to the asyncore test  
							
							
							
						 
						
							2010-08-15 23:28:10 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								f4c7badc02 
								
							 
						 
						
							
							
								
								Put test_ciphers in NetworkedTests  
							
							
							
						 
						
							2010-08-15 23:02:22 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								968dc03f24 
								
							 
						 
						
							
							
								
								Following Ezio's suggestion, force verbose mode on test_ssl to diagnose freezes on 3.x  
							
							
							
						 
						
							2010-08-15 22:16:23 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								3554473309 
								
							 
						 
						
							
							
								
								Merged revisions 84021-84023 via svnmerge from  
							
							... 
							
							
							
							svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
  r84021 | antoine.pitrou | 2010-08-14 18:24:38 +0200 (sam., 14 août 2010) | 4 lines
  Add a reasonable timeout to network SSL tests, so as to avoid buildbot timeouts
  when the remote server doesn't answer.
........
  r84022 | antoine.pitrou | 2010-08-14 18:32:10 +0200 (sam., 14 août 2010) | 4 lines
  This is a better resolution than r84021 (because it will also affect
  ssl.get_server_certificate()).
........
  r84023 | antoine.pitrou | 2010-08-14 18:33:38 +0200 (sam., 14 août 2010) | 3 lines
  There doesn't seem to be a reason for this test to be disabled.
........ 
							
						 
						
							2010-08-14 17:26:19 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								ab6190f9aa 
								
							 
						 
						
							
							
								
								There doesn't seem to be a reason for this test to be disabled.  
							
							
							
						 
						
							2010-08-14 16:33:38 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								d151e27446 
								
							 
						 
						
							
							
								
								This is a better resolution than r84021 (because it will also affect  
							
							... 
							
							
							
							ssl.get_server_certificate()). 
							
						 
						
							2010-08-14 16:32:10 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								35bebe12e0 
								
							 
						 
						
							
							
								
								Add a reasonable timeout to network SSL tests, so as to avoid buildbot timeouts  
							
							... 
							
							
							
							when the remote server doesn't answer. 
							
						 
						
							2010-08-14 16:24:38 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								23df483cb6 
								
							 
						 
						
							
							
								
								Try to fix issue  #9415 : skip some tests on broken Ubuntu OpenSSL  
							
							
							
						 
						
							2010-08-04 17:14:06 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								15cee6209f 
								
							 
						 
						
							
							
								
								In verbose mode, identify OpenSSL build and platform more precisely  
							
							
							
						 
						
							2010-08-04 16:45:21 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Victor Stinner 
								
							 
						 
						
							
							
							
							
								
							
							
								313a120ab6 
								
							 
						 
						
							
							
								
								Issue  #8969 : On Windows, use mbcs codec in strict mode to encode and decode  
							
							... 
							
							
							
							filenames and enable os.fsencode(). 
							
						 
						
							2010-06-11 23:56:51 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								b52187710e 
								
							 
						 
						
							
							
								
								Issue  #4870 : Add an options attribute to SSL contexts, as well as  
							
							... 
							
							
							
							several ``OP_*`` constants to the `ssl` module.  This allows to selectively
disable protocol versions, when used in combination with `PROTOCOL_SSLv23`. 
							
						 
						
							2010-05-21 09:56:06 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								d7e4c1caa6 
								
							 
						 
						
							
							
								
								Typo (thanks Arfrever)  
							
							
							
						 
						
							2010-05-17 14:13:10 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								d0919507f9 
								
							 
						 
						
							
							
								
								Try to fix buildbot failures with old OpenSSLs.  
							
							
							
						 
						
							2010-05-17 10:30:00 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								304740635b 
								
							 
						 
						
							
							
								
								"xyzzy" is not a silly enough name for some OpenSSL versions to report an error  
							
							
							
						 
						
							2010-05-16 23:46:26 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								27ba6388ed 
								
							 
						 
						
							
							
								
								Do not fail if ssl fails to import  
							
							
							
						 
						
							2010-05-16 20:35:03 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								65ec8ae47f 
								
							 
						 
						
							
							
								
								Fix (hopefully) the remaining test_ssl buildbot failures  
							
							
							
						 
						
							2010-05-16 19:56:32 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								467f28de03 
								
							 
						 
						
							
							
								
								Followup on r81233: fix test_ssl with OpenSSL < 1.0.0.  
							
							
							
						 
						
							2010-05-16 19:22:44 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								152efa2ae2 
								
							 
						 
						
							
							
								
								Issue  #8550 : Add first class SSLContext objects to the ssl module.  
							
							
							
						 
						
							2010-05-16 18:19:27 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								d75b2a90d9 
								
							 
						 
						
							
							
								
								Merged revisions 80869 via svnmerge from  
							
							... 
							
							
							
							svn+ssh://pythondev@svn.python.org/python/trunk
........
  r80869 | antoine.pitrou | 2010-05-06 16:11:23 +0200 (jeu., 06 mai 2010) | 3 lines
  `self` doesn't exist here
........ 
							
						 
						
							2010-05-06 14:15:10 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								452a580848 
								
							 
						 
						
							
							
								
								Issue  #8629 : Disable some test_ssl tests, since they give different  
							
							... 
							
							
							
							results with OpenSSL 1.0.0 and higher. 
							
						 
						
							2010-05-06 13:54:43 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								7effde0014 
								
							 
						 
						
							
							
								
								Merged revisions 80692 via svnmerge from  
							
							... 
							
							
							
							svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
  r80692 | antoine.pitrou | 2010-05-01 22:29:38 +0200 (sam., 01 mai 2010) | 9 lines
  Merged revisions 80690 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk
  ........
    r80690 | antoine.pitrou | 2010-05-01 22:26:58 +0200 (sam., 01 mai 2010) | 3 lines
    Remove duplicate test
  ........
................ 
							
						 
						
							2010-05-01 20:33:30 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								70d8a86ea0 
								
							 
						 
						
							
							
								
								Merged revisions 80690 via svnmerge from  
							
							... 
							
							
							
							svn+ssh://pythondev@svn.python.org/python/trunk
........
  r80690 | antoine.pitrou | 2010-05-01 22:26:58 +0200 (sam., 01 mai 2010) | 3 lines
  Remove duplicate test
........ 
							
						 
						
							2010-05-01 20:29:38 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								b199796f97 
								
							 
						 
						
							
							
								
								Merged revisions 80603 via svnmerge from  
							
							... 
							
							
							
							svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
  r80603 | antoine.pitrou | 2010-04-29 00:57:15 +0200 (jeu., 29 avril 2010) | 3 lines
  Fix test failure with -bb
........ 
							
						 
						
							2010-04-28 22:58:16 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								764b8780db 
								
							 
						 
						
							
							
								
								Fix test failure with -bb  
							
							
							
						 
						
							2010-04-28 22:57:15 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								91382d8a23 
								
							 
						 
						
							
							
								
								Merged revisions 80598 via svnmerge from  
							
							... 
							
							
							
							svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
  r80598 | antoine.pitrou | 2010-04-28 23:37:09 +0200 (mer., 28 avril 2010) | 9 lines
  Merged revisions 80596 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk
  ........
    r80596 | antoine.pitrou | 2010-04-28 23:11:01 +0200 (mer., 28 avril 2010) | 3 lines
    Fix style issues in test_ssl
  ........
................ 
							
						 
						
							2010-04-28 21:39:56 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								480a124973 
								
							 
						 
						
							
							
								
								Merged revisions 80596 via svnmerge from  
							
							... 
							
							
							
							svn+ssh://pythondev@svn.python.org/python/trunk
........
  r80596 | antoine.pitrou | 2010-04-28 23:11:01 +0200 (mer., 28 avril 2010) | 3 lines
  Fix style issues in test_ssl
........ 
							
						 
						
							2010-04-28 21:37:09 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								00f905e8f2 
								
							 
						 
						
							
							
								
								Merged revisions 80559 via svnmerge from  
							
							... 
							
							
							
							svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
  r80559 | antoine.pitrou | 2010-04-28 00:08:08 +0200 (mer., 28 avril 2010) | 12 lines
  Merged revisions 80557 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk
  (the bug was already fixed in py3k, just merging in the tests)
  ........
    r80557 | antoine.pitrou | 2010-04-28 00:03:37 +0200 (mer., 28 avril 2010) | 4 lines
    Issue #8086 : In :func:`ssl.DER_cert_to_PEM_cert()`, fix missing newline
    before the certificate footer.  Patch by Kyle VanderBeek.
  ........
................ 
							
						 
						
							2010-04-27 22:09:05 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								9bfbe61961 
								
							 
						 
						
							
							
								
								Merged revisions 80557 via svnmerge from  
							
							... 
							
							
							
							svn+ssh://pythondev@svn.python.org/python/trunk
(the bug was already fixed in py3k, just merging in the tests)
........
  r80557 | antoine.pitrou | 2010-04-28 00:03:37 +0200 (mer., 28 avril 2010) | 4 lines
  Issue #8086 : In :func:`ssl.DER_cert_to_PEM_cert()`, fix missing newline
  before the certificate footer.  Patch by Kyle VanderBeek.
........ 
							
						 
						
							2010-04-27 22:08:08 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Antoine Pitrou 
								
							 
						 
						
							
							
							
							
								
							
							
								537bed68ba 
								
							 
						 
						
							
							
								
								Merged revisions 80536 via svnmerge from  
							
							... 
							
							
							
							svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
  r80536 | antoine.pitrou | 2010-04-27 15:15:18 +0200 (mar., 27 avril 2010) | 9 lines
  Merged revisions 80534 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk
  ........
    r80534 | antoine.pitrou | 2010-04-27 15:13:26 +0200 (mar., 27 avril 2010) | 3 lines
    socket.error can really happen here, and fix a possible NameError
  ........
................ 
							
						 
						
							2010-04-27 13:16:06 +00:00