mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 13:41:24 +00:00 
			
		
		
		
	Merged revisions 73715 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k ........ r73715 | benjamin.peterson | 2009-07-01 01:06:06 +0200 (Mi, 01 Jul 2009) | 1 line convert old fail* assertions to assert* ........
This commit is contained in:
		
							parent
							
								
									ef82be368a
								
							
						
					
					
						commit
						ab91fdef1f
					
				
					 274 changed files with 4538 additions and 4538 deletions
				
			
		|  | @ -265,7 +265,7 @@ def testTimeoutAttribute(self): | |||
|         # and into the socket. | ||||
| 
 | ||||
|         # default -- use global socket timeout | ||||
|         self.assert_(socket.getdefaulttimeout() is None) | ||||
|         self.assertTrue(socket.getdefaulttimeout() is None) | ||||
|         socket.setdefaulttimeout(30) | ||||
|         try: | ||||
|             httpConn = client.HTTPConnection(HOST, TimeoutTest.PORT) | ||||
|  | @ -276,7 +276,7 @@ def testTimeoutAttribute(self): | |||
|         httpConn.close() | ||||
| 
 | ||||
|         # no timeout -- do not use global socket default | ||||
|         self.assert_(socket.getdefaulttimeout() is None) | ||||
|         self.assertTrue(socket.getdefaulttimeout() is None) | ||||
|         socket.setdefaulttimeout(30) | ||||
|         try: | ||||
|             httpConn = client.HTTPConnection(HOST, TimeoutTest.PORT, | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Georg Brandl
						Georg Brandl