[Python-checkins] r86515 - in python/branches/release31-maint: Lib/test/test_xmlrpc.py Lib/xmlrpc/client.py

[senthil.kumaran]

Author: senthil.kumaran
Date: Thu Nov 18 16:04:41 2010
New Revision: 86515

Log:
Merged revisions 86514 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86514 | senthil.kumaran | 2010-11-18 23:00:53 +0800 (Thu, 18 Nov 2010) | 3 lines
  
  Fix Issue 9991: xmlrpc client ssl check faulty
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_xmlrpc.py
   python/branches/release31-maint/Lib/xmlrpc/client.py

Modified: python/branches/release31-maint/Lib/test/test_xmlrpc.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_xmlrpc.py	(original)
+++ python/branches/release31-maint/Lib/test/test_xmlrpc.py	Thu Nov 18 16:04:41 2010
@@ -143,6 +143,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):
     def test_escape(self):

Modified: python/branches/release31-maint/Lib/xmlrpc/client.py
==============================================================================
--- python/branches/release31-maint/Lib/xmlrpc/client.py	(original)
+++ python/branches/release31-maint/Lib/xmlrpc/client.py	Thu Nov 18 16:04:41 2010
@@ -1178,7 +1178,7 @@
 
     def send_request(self, host, handler, request_body, debug):
         import socket
-        if not hasattr(socket, "ssl"):
+        if not hasattr(http.client, "ssl"):
             raise NotImplementedError(
                 "your version of http.client doesn't support HTTPS")