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

Merge branch 'init-with-socket' of https://github.com/ilysym/websocket-client into ilysym-init-with-socket

Browse Source
This commit is contained in:
liris
2016-01-04 15:18:39 +09:00
parent df5519a37e e49eceac91
commit 78ce8024a6
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
websocket/_core.py
View File

@@ -90,6 +90,7 @@ def create_connection(url, timeout=None, **options):
"subprotocols" - array of available sub protocols.
default is None.
"skip_utf8_validation" - skip utf8 validation.
"socket" - pre-initialized stream socket.
"""
sockopt = options.get("sockopt", [])
sslopt = options.get("sslopt", {})
@@ -261,9 +262,11 @@ class WebSocket(object):
default is None
"subprotocols" - array of available sub protocols.
default is None.
"socket" - pre-initialized stream socket.
"""
self.sock, addrs = connect(url, self.sock_opt, proxy_info(**options))
self.sock, addrs = connect(url, self.sock_opt, proxy_info(**options),
options.pop('socket', None))
try:
self.handshake_response = handshake(self.sock, *addrs, **options)

6
websocket/_http.py
View File

@@ -51,8 +51,12 @@ class proxy_info(object):
self.auth = None
self.no_proxy = None
def connect(url, options, proxy):
def connect(url, options, proxy, socket):
hostname, port, resource, is_secure = parse_url(url)
if socket:
return socket, (hostname, port, resource)
addrinfo_list, need_tunnel, auth = _get_addrinfo_list(hostname, port, is_secure, proxy)
if not addrinfo_list:
raise WebSocketException(