jyapayne/socketIO-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #58 from antonzy/master

Browse source 
Working migration to 3.4.1
This commit is contained in:
Roy Hyunjin Han 2014-11-18 10:38:32 -05:00
commit 1c2a313002
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
socketIO_client/__init__.py
View file

@ -3,7 +3,7 @@ import json
import requests import requests
import time import time
from collections import namedtuple from collections import namedtuple
from urlparse import urlparse from urllib import parse
from .exceptions import ConnectionError, TimeoutError, PacketError from .exceptions import ConnectionError, TimeoutError, PacketError
from .transports import _get_response, _negotiate_transport, TRANSPORTS from .transports import _get_response, _negotiate_transport, TRANSPORTS
@ -254,13 +254,13 @@ class SocketIO(object):
# Initialize heartbeat_pacemaker # Initialize heartbeat_pacemaker
self.heartbeat_pacemaker = self._make_heartbeat_pacemaker( self.heartbeat_pacemaker = self._make_heartbeat_pacemaker(
heartbeat_interval=socketIO_session.heartbeat_timeout / 2) heartbeat_interval=socketIO_session.heartbeat_timeout / 2)
self.heartbeat_pacemaker.next() next(self.heartbeat_pacemaker)
# Negotiate transport # Negotiate transport
transport = _negotiate_transport( transport = _negotiate_transport(
self.client_supported_transports, socketIO_session, self.client_supported_transports, socketIO_session,
self.is_secure, self.base_url, **self.kw) self.is_secure, self.base_url, **self.kw)
# Update namespaces # Update namespaces
for path, namespace in self._namespace_by_path.iteritems(): for path, namespace in self._namespace_by_path.items():
namespace._transport = transport namespace._transport = transport
transport.connect(path) transport.connect(path)
return transport return transport
@ -364,7 +364,7 @@ def find_callback(args, kw=None):
def _parse_host(host, port): def _parse_host(host, port):
if not host.startswith('http'): if not host.startswith('http'):
host = 'http://' + host host = 'http://' + host
url_pack = urlparse(host) url_pack = parse.urlparse(host)
is_secure = url_pack.scheme == 'https' is_secure = url_pack.scheme == 'https'
port = port or url_pack.port or (443 if is_secure else 80) port = port or url_pack.port or (443 if is_secure else 80)
base_url = '%s:%d%s/socket.io/%s' % ( base_url = '%s:%d%s/socket.io/%s' % (

3
socketIO_client/transports.py
View file

@ -6,7 +6,6 @@ import six
import socket import socket
import time import time
import websocket import websocket
from itertools import izip
from .exceptions import SocketIOError, ConnectionError, TimeoutError from .exceptions import SocketIOError, ConnectionError, TimeoutError
@ -295,7 +294,7 @@ def _negotiate_transport(
def _yield_text_from_framed_data(framed_data, parse=lambda x: x): def _yield_text_from_framed_data(framed_data, parse=lambda x: x):
parts = [parse(x) for x in framed_data.split(BOUNDARY)] parts = [parse(x) for x in framed_data.split(BOUNDARY)]
for text_length, text in izip(parts[1::2], parts[2::2]): for text_length, text in zip(parts[1::2], parts[2::2]):
if text_length != str(len(text)): if text_length != str(len(text)):
warning = 'invalid declared length=%s for packet_text=%s' % ( warning = 'invalid declared length=%s for packet_text=%s' % (
text_length, text) text_length, text)