mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-13 10:23:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Code Changes as per review comments by Antoine Pitrou.

Browse source
This commit is contained in:
Senthil Kumaran 2010-11-18 17:08:48 +00:00
parent 713d3039dc
commit 6a0b5c414c
2 changed files with 10 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Lib/test/test_xmlrpc.py
View file

@ -150,31 +150,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

@ -1330,7 +1330,7 @@ class SafeTransport(Transport):
if self._connection and host == self._connection[0]: if self._connection and host == self._connection[0]:
return self._connection[1] return self._connection[1]
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")
# create a HTTPS connection object from a host descriptor # create a HTTPS connection object from a host descriptor