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

Migrate to 3.4

Browse source
This commit is contained in:
antonzy 2014-09-22 17:08:44 +03:00
commit 9a80988e26
1 changed files with 4 additions and 4 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' % (