Run under Python 3
This will make the code I wrote in : http://lists.wikimedia.org/pipermail/wikitech-l/2014-May/076373.html actually work in modern versions of Python.
This commit is contained in:
parent
2e2496cd4c
commit
c35316f158
2 changed files with 10 additions and 4 deletions
|
|
@ -3,7 +3,10 @@ import json
|
||||||
import requests
|
import requests
|
||||||
import time
|
import time
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
try:
|
||||||
from urlparse import urlparse
|
from urlparse import urlparse
|
||||||
|
except:
|
||||||
|
from urllib.parse import urlparse
|
||||||
|
|
||||||
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 +257,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
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,10 @@ import six
|
||||||
import socket
|
import socket
|
||||||
import time
|
import time
|
||||||
import websocket
|
import websocket
|
||||||
|
try:
|
||||||
from itertools import izip
|
from itertools import izip
|
||||||
|
except:
|
||||||
|
izip = zip
|
||||||
|
|
||||||
from .exceptions import SocketIOError, ConnectionError, TimeoutError
|
from .exceptions import SocketIOError, ConnectionError, TimeoutError
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue