From: Thomas Wouters <thomas@python.org>
Date: Thu, 30 Aug 2007 22:39:17 +0000 (+0000)
Subject: Merged revisions 57772-57777 via svnmerge from
X-Git-Tag: v3.0a1~51
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=582b5866174d20f7c027cbb6fb757fefb382f96f;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index bbcdd8b42147..632c2bc563f3 100644
--- a/Lib/test/test_httplib.py
+++ b/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)