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

[senthil.kumaran]

Author: senthil.kumaran
Date: Thu Nov 18 18:11:45 2010
New Revision: 86524

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


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 18:11:45 2010
@@ -144,30 +144,18 @@
                            [('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):

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 18:11:45 2010
@@ -1178,7 +1178,7 @@
 
     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")