mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 18:59:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merged revisions 86523 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Senthil Kumaran 2010-11-18 17:11:45 +00:00
parent 723a7a6d93
commit dae5b84fe7
2 changed files with 10 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Lib/test/test_xmlrpc.py
View file

@ -144,30 +144,18 @@ class XMLRPCTestCase(unittest.TestCase):
[('Authorization', 'Basic dXNlcg==')], {})) [('Authorization', 'Basic dXNlcg==')], {}))
def test_ssl_presence(self): def test_ssl_presence(self):
#Check for ssl support try:
have_ssl = False import ssl
if hasattr(socket, 'ssl'): except:
have_ssl = True have_ssl = False
else: else:
try: has_ssl = True
import ssl
except:
pass
else:
have_ssl = True
try: try:
xmlrpc.client.ServerProxy('https://localhost:9999').bad_function() xmlrpc.client.ServerProxy('https://localhost:9999').bad_function()
except: except NotImplementedError:
exc = sys.exc_info() self.assertFalse(has_ssl, "xmlrpc client's error with SSL support")
if exc[0] == socket.error: except socket.error:
self.assertTrue(have_ssl, self.assertTrue(has_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): class HelperTestCase(unittest.TestCase):
def test_escape(self): def test_escape(self):

2
Lib/xmlrpc/client.py
View file

@ -1178,7 +1178,7 @@ class SafeTransport(Transport):
def send_request(self, host, handler, request_body, debug): def send_request(self, host, handler, request_body, debug):
import socket import socket
if not hasattr(http.client, "ssl"): if not hasattr(http.client, "HTTPSConnection"):
raise NotImplementedError( raise NotImplementedError(
"your version of http.client doesn't support HTTPS") "your version of http.client doesn't support HTTPS")