summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wouters <thomas@python.org>2007-08-30 22:39:17 (GMT)
committerThomas Wouters <thomas@python.org>2007-08-30 22:39:17 (GMT)
commit582b5866174d20f7c027cbb6fb757fefb382f96f (patch)
treee3173729af59126ca37838cc1a822e80a8d588b9
parent185e30cdf330b0c687a7afaf26b1eef761ff12ca (diff)
downloadcpython-582b5866174d20f7c027cbb6fb757fefb382f96f.zip
cpython-582b5866174d20f7c027cbb6fb757fefb382f96f.tar.gz
cpython-582b5866174d20f7c027cbb6fb757fefb382f96f.tar.bz2
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. ........
-rw-r--r--Lib/test/test_httplib.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index bbcdd8b..632c2bc 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)