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 time
|
||||
from collections import namedtuple
|
||||
from urlparse import urlparse
|
||||
try:
|
||||
from urlparse import urlparse
|
||||
except:
|
||||
from urllib.parse import urlparse
|
||||
|
||||
from .exceptions import ConnectionError, TimeoutError, PacketError
|
||||
from .transports import _get_response, _negotiate_transport, TRANSPORTS
|
||||
|
|
@ -254,13 +257,13 @@ class SocketIO(object):
|
|||
# Initialize heartbeat_pacemaker
|
||||
self.heartbeat_pacemaker = self._make_heartbeat_pacemaker(
|
||||
heartbeat_interval=socketIO_session.heartbeat_timeout / 2)
|
||||
self.heartbeat_pacemaker.next()
|
||||
next(self.heartbeat_pacemaker)
|
||||
# Negotiate transport
|
||||
transport = _negotiate_transport(
|
||||
self.client_supported_transports, socketIO_session,
|
||||
self.is_secure, self.base_url, **self.kw)
|
||||
# Update namespaces
|
||||
for path, namespace in self._namespace_by_path.iteritems():
|
||||
for path, namespace in self._namespace_by_path.items():
|
||||
namespace._transport = transport
|
||||
transport.connect(path)
|
||||
return transport
|
||||
|
|
|
|||
|
|
@ -6,7 +6,10 @@ import six
|
|||
import socket
|
||||
import time
|
||||
import websocket
|
||||
from itertools import izip
|
||||
try:
|
||||
from itertools import izip
|
||||
except:
|
||||
izip = zip
|
||||
|
||||
from .exceptions import SocketIOError, ConnectionError, TimeoutError
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue