Merged revisions 86523 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86523 | senthil.kumaran | 2010-11-19 01:08:48 +0800 (Fri, 19 Nov 2010) | 3 lines

  Code Changes as per review comments by Antoine Pitrou.
........

diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xmlrpc.py
index 8f41d7fec1070c954f2978cbc2e714d56094e857..7236947f580b00feb4d53e801de66295bf4a4391 100644 (file)
--- a/Lib/test/test_xmlrpc.py
+++ b/Lib/test/test_xmlrpc.py
@@ -144,30 +144,18 @@ class XMLRPCTestCase(unittest.TestCase):
                            [('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()
+            import ssl
         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.")
+            have_ssl = False
         else:
-            self.fail("Unable to determine status of SSL check.")
+            has_ssl = True
+        try:
+            xmlrpc.client.ServerProxy('https://localhost:9999').bad_function()
+        except NotImplementedError:
+            self.assertFalse(has_ssl, "xmlrpc client's error with SSL support")
+        except socket.error:
+            self.assertTrue(has_ssl)
 
 class HelperTestCase(unittest.TestCase):
     def test_escape(self):

diff --git a/Lib/xmlrpc/client.py b/Lib/xmlrpc/client.py
index d7dbbcc2e1144b31c41173df227773019dcd3ede..9357ac33e2ae984c5a16678117ee500c7273d078 100644 (file)
--- a/Lib/xmlrpc/client.py
+++ b/Lib/xmlrpc/client.py
@@ -1178,7 +1178,7 @@ class SafeTransport(Transport):
 
     def send_request(self, host, handler, request_body, debug):
         import socket
-        if not hasattr(http.client, "ssl"):
+        if not hasattr(http.client, "HTTPSConnection"):
             raise NotImplementedError(
                 "your version of http.client doesn't support HTTPS")