[Python-3000-checkins] r57778 - in python/branches/py3k: Lib/test/test_httplib.py

thomas.wouters python-3000-checkins at python.org
Fri Aug 31 00:39:17 CEST 2007


Author: thomas.wouters
Date: Fri Aug 31 00:39:17 2007
New Revision: 57778

Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_httplib.py
Log:
Merged revisions 57772-57777 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r57776 | thomas.wouters | 2007-08-31 00:35:31 +0200 (Fri, 31 Aug 2007) | 4 lines
  
  
  One more fix to consider missing SSL support.
........


Modified: python/branches/py3k/Lib/test/test_httplib.py
==============================================================================
--- python/branches/py3k/Lib/test/test_httplib.py	(original)
+++ python/branches/py3k/Lib/test/test_httplib.py	Fri Aug 31 00:39:17 2007
@@ -201,8 +201,9 @@
 
     def test_attributes(self):
         # simple test to check it's storing it
-        h = httplib.HTTPSConnection(HOST, PORT, timeout=30)
-        self.assertEqual(h.timeout, 30)
+        if hasattr(httplib, 'HTTPSConnection'):
+            h = httplib.HTTPSConnection(HOST, PORT, timeout=30)
+            self.assertEqual(h.timeout, 30)
 
 def test_main(verbose=None):
     test_support.run_unittest(HeaderTests, OfflineTest, BasicTest, TimeoutTest, HTTPSTimeoutTest)


More information about the Python-3000-checkins mailing list