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.
........

Lib/test/test_httplib.py

@@ -201,8 +201,9 @@ class HTTPSTimeoutTest(TestCase):
 
     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)