openstack/deb-python-pyvmomi
Code Issues Proposed changes

Only pass in arguments to the httplib.HTTPConnection init that it can handle.

Browse Source
This commit is contained in:
Tianhao He
2015-11-06 14:55:27 -08:00
parent b812a1d8f6
commit e12ed16e6d
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pyVmomi/SoapAdapter.py
View File

@@ -963,7 +963,7 @@ except ImportError:
class HTTPSConnectionWrapper(object): class HTTPSConnectionWrapper(object):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
wrapped = http_client.HTTPSConnection(*args, **kwargs) wrapped = http_client.HTTPSConnection(*args, **kwargs)
# Extract ssl.wrap_socket param unknown to httplib.HTTPConnection, # Extract ssl.wrap_socket param unknown to httplib.HTTPSConnection,
# and push back the params in connect() # and push back the params in connect()
self._sslArgs = {} self._sslArgs = {}
tmpKwargs = kwargs.copy() tmpKwargs = kwargs.copy()
@@ -1028,11 +1028,13 @@ class SSLTunnelConnection(object):
# @param kwargs In case caller passed in extra parameters not handled by # @param kwargs In case caller passed in extra parameters not handled by
# SSLTunnelConnection # SSLTunnelConnection
def __call__(self, path, key_file=None, cert_file=None, **kwargs): def __call__(self, path, key_file=None, cert_file=None, **kwargs):
# Don't pass any keyword args that HTTPConnection won't understand. # Only pass in the named arguments that HTTPConnection constructor
for arg in kwargs.keys(): # understands
if arg not in ("port", "strict", "timeout", "source_address"): tmpKwargs = {}
del kwargs[arg] for key in http_client.HTTPConnection.__init__.__code__.co_varnames:
tunnel = http_client.HTTPConnection(path, **kwargs) if key in kwargs and key != 'self':
tmpKwargs[key] = kwargs[key]
tunnel = http_client.HTTPConnection(path, **tmpKwargs)
tunnel.request('CONNECT', self.proxyPath) tunnel.request('CONNECT', self.proxyPath)
resp = tunnel.getresponse() resp = tunnel.getresponse()
if resp.status != 200: if resp.status != 200: