diff options
author | liris <liris.pp@gmail.com> | 2014-06-26 08:30:37 +0900 |
---|---|---|
committer | liris <liris.pp@gmail.com> | 2014-06-26 08:30:37 +0900 |
commit | 181ca1d8d0898102f546923fb63b735887d78abc (patch) | |
tree | 43da1d250958ce16ee93544807295af669ae6e60 | |
parent | 29bdbfe62dbf30b4deecc3e1c829a947a6468fb3 (diff) | |
download | websocket-client-181ca1d8d0898102f546923fb63b735887d78abc.tar.gz |
- refs #91
- give up to support socket io
- we should handshake with socket io out of this module.
-rw-r--r-- | README.rst | 8 | ||||
-rw-r--r-- | websocket/_core.py | 27 |
2 files changed, 2 insertions, 33 deletions
@@ -44,11 +44,6 @@ Default squid setting is "ALLOWED TO CONNECT ONLY HTTPS PORT". Current implementation of websocket-client is using "CONNECT" method via proxy. -Socket IO support -================== - -We have experimental support for socket io 0.9, not 1.0 since websocket client v0.16.0. -This implementation is experimetal and API migth be changed. expamle:: ------------- @@ -158,9 +153,6 @@ example:: ChangeLog ============ -- v0.16.0 - - experimental support for socket io 0.9 (#91) - - v0.15.0 - fixed exception when send a large message (#84) diff --git a/websocket/_core.py b/websocket/_core.py index 29e53a2..780706e 100644 --- a/websocket/_core.py +++ b/websocket/_core.py @@ -210,10 +210,8 @@ def create_connection(url, timeout=None, **options): sslopt = options.get("sslopt", {}) fire_cont_frame = options.get("fire_cont_frame", False) enable_multithread = options.get("enable_multithread", False) - support_socket_io = options.get("support_socket_io", None) websock = WebSocket(sockopt=sockopt, sslopt=sslopt, - fire_cont_frame = fire_cont_frame, enable_multithread=enable_multithread, - support_socket_io=support_socket_io) + fire_cont_frame = fire_cont_frame, enable_multithread=enable_multithread) websock.settimeout(timeout if timeout is not None else default_timeout) websock.connect(url, **options) return websock @@ -330,8 +328,7 @@ class WebSocket(object): """ def __init__(self, get_mask_key=None, sockopt=None, sslopt=None, - fire_cont_frame=False, enable_multithread=False, - support_socket_io=None): + fire_cont_frame=False, enable_multithread=False): """ Initalize WebSocket object. """ @@ -356,7 +353,6 @@ class WebSocket(object): self.lock = threading.Lock() else: self.lock = NoLock() - self.support_socket_io = support_socket_io def fileno(self): return self.sock.fileno() @@ -504,18 +500,6 @@ class WebSocket(object): return headers, key - def _get_handshake_socket_io(self, host, port, resource, resp_headers, **options): - body_length = int(resp_headers['content-length']) - body = self._recv_strict(body_length) - body = body.decode('utf-8') - _dump("response body", body) - - sessid, heartbeat, close, transports = body.split(':', 4) - transport = transports.split(',')[0] - resource += transport + '/' + sessid - - return self._get_handshake_headers(resource, host, port, options) - def _handshake(self, host, port, resource, **options): headers, key = self._get_handshake_headers(resource, host, port, options) @@ -523,13 +507,6 @@ class WebSocket(object): self._send(header_str) _dump("request header", header_str) - if self.support_socket_io == "0.9": - resp_headers = self._get_resp_headers(200) - headers, key = self._get_handshake_socket_io(host, port, resource, resp_headers, **options) - header_str = "\r\n".join(headers) - self._send(header_str) - _dump("request header", header_str) - resp_headers = self._get_resp_headers() success = self._validate_header(resp_headers, key) if not success: |