openstack/deb-python-websocket-client
Code Issues Proposed changes

Merge pull request #168 from enewhuis/master

Browse Source 
Fix erroneous argument shadowing
This commit is contained in:
liris
2015-04-01 10:09:34 +09:00
parent bb5f395eb2 eda4645198
commit 7f1802ff74
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
websocket/_http.py
View File

@@ -117,13 +117,13 @@ def _open_socket(addrinfo_list, sockopt, timeout):
return sock return sock
def _ssl_socket(sock, sslopt, hostname): def _ssl_socket(sock, user_sslopt, hostname):
sslopt = dict(cert_reqs=ssl.CERT_REQUIRED) sslopt = dict(cert_reqs=ssl.CERT_REQUIRED)
certPath = os.path.join( certPath = os.path.join(
os.path.dirname(__file__), "cacert.pem") os.path.dirname(__file__), "cacert.pem")
if os.path.isfile(certPath): if os.path.isfile(certPath):
sslopt['ca_certs'] = certPath sslopt['ca_certs'] = certPath
sslopt.update(sslopt) sslopt.update(user_sslopt)
check_hostname = sslopt.pop('check_hostname', True) check_hostname = sslopt.pop('check_hostname', True)
sock = ssl.wrap_socket(sock, **sslopt) sock = ssl.wrap_socket(sock, **sslopt)
if (sslopt["cert_reqs"] != ssl.CERT_NONE and check_hostname): if (sslopt["cert_reqs"] != ssl.CERT_NONE and check_hostname):