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

Merge conflicts

Browse source
This commit is contained in:
Roy Hyunjin Han 2015-02-15 10:50:20 -05:00
commit 3aab1f1436
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
socketIO_client/__init__.py
View file

@ -247,7 +247,7 @@ class SocketIO(object):
break
try:
try:
self._process_events()
self._process_events(timeout=seconds)
except TimeoutError:
pass
self.heartbeat_pacemaker.next()
@ -259,8 +259,8 @@ class SocketIO(object):
self.log(logging.WARNING, warning)
self.disconnect()
def _process_events(self):
for packet in self._transport.recv_packet():
def _process_events(self, timeout=None):
for packet in self._transport.recv_packet(timeout):
try:
self._process_packet(packet)
except PacketError as e: