[Python-checkins] r86514 - in python/branches/py3k/Lib: test/test_xmlrpc.py xmlrpc/client.py
senthil.kumaran
python-checkins at python.org
Thu Nov 18 16:00:53 CET 2010
Author: senthil.kumaran
Date: Thu Nov 18 16:00:53 2010
New Revision: 86514
Log:
Fix Issue 9991: xmlrpc client ssl check faulty
Modified:
python/branches/py3k/Lib/test/test_xmlrpc.py
python/branches/py3k/Lib/xmlrpc/client.py
Modified: python/branches/py3k/Lib/test/test_xmlrpc.py
==============================================================================
--- python/branches/py3k/Lib/test/test_xmlrpc.py (original)
+++ python/branches/py3k/Lib/test/test_xmlrpc.py Thu Nov 18 16:00:53 2010
@@ -149,6 +149,31 @@
('host.tld',
[('Authorization', 'Basic dXNlcg==')], {}))
+ def test_ssl_presence(self):
+ #Check for ssl support
+ have_ssl = False
+ if hasattr(socket, 'ssl'):
+ have_ssl = True
+ else:
+ try:
+ import ssl
+ except:
+ pass
+ else:
+ have_ssl = True
+ try:
+ xmlrpc.client.ServerProxy('https://localhost:9999').bad_function()
+ except:
+ exc = sys.exc_info()
+ if exc[0] == socket.error:
+ self.assertTrue(have_ssl,
+ "No SSL support, but xmlrpclib reports supported.")
+ elif exc[0] == NotImplementedError and str(exc[1]) == \
+ "your version of http.client doesn't support HTTPS":
+ self.assertFalse(have_ssl,
+ "SSL supported, but xmlrpclib reports not.")
+ else:
+ self.fail("Unable to determine status of SSL check.")
class HelperTestCase(unittest.TestCase):
Modified: python/branches/py3k/Lib/xmlrpc/client.py
==============================================================================
--- python/branches/py3k/Lib/xmlrpc/client.py (original)
+++ python/branches/py3k/Lib/xmlrpc/client.py Thu Nov 18 16:00:53 2010
@@ -1330,7 +1330,7 @@
if self._connection and host == self._connection[0]:
return self._connection[1]
- if not hasattr(socket, "ssl"):
+ if not hasattr(http.client, "ssl"):
raise NotImplementedError(
"your version of http.client doesn't support HTTPS")
# create a HTTPS connection object from a host descriptor
More information about the Python-checkins
mailing list