Skip to content

Commit adb5652

Browse files
barpbarp
committed
fix stuff
1 parent 938313d commit adb5652

4 files changed

Lines changed: 23 additions & 24 deletions

File tree

‎src/socketio/async_server.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -552,9 +552,9 @@ async def _send_packet(self, eio_sid, pkt):
552552

553553
# Only append offset if not already there (binary packets)
554554
last_is_offset = (
555-
isinstance(pkt.data, list) and len(pkt.data) > 0 and
556-
isinstance(pkt.data[-1], str) and
557-
len(pkt.data[-1]) == 7)
555+
isinstance(pkt.data, list) and len(pkt.data) > 0
556+
and isinstance(pkt.data[-1], str)
557+
and len(pkt.data[-1]) == 7)
558558
if not last_is_offset:
559559
pkt.data = list(pkt.data) + [offset]
560560

@@ -592,10 +592,10 @@ async def _handle_connect(self, eio_sid, namespace, data):
592592
sid = recovery_info['sid']
593593
# Reconnect with the same sid
594594
ns_allowed = (
595-
namespace in self.handlers or
596-
namespace in self.namespace_handlers or
597-
self.namespaces == '*' or
598-
namespace in self.namespaces)
595+
namespace in self.handlers
596+
or namespace in self.namespace_handlers
597+
or self.namespaces == '*'
598+
or namespace in self.namespaces)
599599
if ns_allowed:
600600
# Re-establish connection with recovered sid
601601
try:
@@ -622,10 +622,10 @@ async def _handle_connect(self, eio_sid, namespace, data):
622622
# Create new connection if recovery didn't work
623623
if sid is None:
624624
ns_allowed = (
625-
namespace in self.handlers or
626-
namespace in self.namespace_handlers or
627-
self.namespaces == '*' or
628-
namespace in self.namespaces)
625+
namespace in self.handlers
626+
or namespace in self.namespace_handlers
627+
or self.namespaces == '*'
628+
or namespace in self.namespaces)
629629
if ns_allowed:
630630
sid = await self.manager.connect(eio_sid, namespace)
631631
if sid is None:

‎src/socketio/base_server.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ def _restore_recovery_state(self, pid, namespace, offset=None):
353353
return None
354354

355355
recovery = self._recovery_sessions[pid][namespace]
356-
356+
357357
# Check if session has expired
358358
cfg = self.connection_state_recovery
359359
max_duration = cfg['max_disconnection_duration']

‎src/socketio/server.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -534,9 +534,9 @@ def _send_packet(self, eio_sid, pkt):
534534

535535
# Only append offset if not already there (binary packets)
536536
last_is_offset = (
537-
isinstance(pkt.data, list) and len(pkt.data) > 0 and
538-
isinstance(pkt.data[-1], str) and
539-
len(pkt.data[-1]) == 7)
537+
isinstance(pkt.data, list) and len(pkt.data) > 0
538+
and isinstance(pkt.data[-1], str)
539+
and len(pkt.data[-1]) == 7)
540540
if not last_is_offset:
541541
pkt.data = list(pkt.data) + [offset]
542542

@@ -574,10 +574,10 @@ def _handle_connect(self, eio_sid, namespace, data):
574574
sid = recovery_info['sid']
575575
# Reconnect with the same sid
576576
ns_allowed = (
577-
namespace in self.handlers or
578-
namespace in self.namespace_handlers or
579-
self.namespaces == '*' or
580-
namespace in self.namespaces)
577+
namespace in self.handlers
578+
or namespace in self.namespace_handlers
579+
or self.namespaces == '*'
580+
or namespace in self.namespaces)
581581
if ns_allowed:
582582
# Re-establish connection with recovered sid
583583
try:
@@ -604,10 +604,10 @@ def _handle_connect(self, eio_sid, namespace, data):
604604
# Create new connection if recovery didn't work
605605
if sid is None:
606606
ns_allowed = (
607-
namespace in self.handlers or
608-
namespace in self.namespace_handlers or
609-
self.namespaces == '*' or
610-
namespace in self.namespaces)
607+
namespace in self.handlers
608+
or namespace in self.namespace_handlers
609+
or self.namespaces == '*'
610+
or namespace in self.namespaces)
611611
if ns_allowed:
612612
sid = self.manager.connect(eio_sid, namespace)
613613
if sid is None:

‎tests/common/test_recovery.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@ def test_offset_in_packets(self, eio):
254254
s._handle_eio_connect('eio123', {})
255255
connect_pkt = packet.Packet(packet.CONNECT, namespace='/', data={})
256256
s._handle_eio_message('eio123', connect_pkt.encode())
257-
sid = '1'
258257
eio_sid = 'eio123'
259258

260259
# Send an event

0 commit comments

Comments
 (0)