From 92a37c2e4fe77c12ba2b74c6d283ae4b776917c0 Mon Sep 17 00:00:00 2001 From: Rapptz Date: Sat, 14 Oct 2017 15:22:39 -0400 Subject: Revert "Implement zlib streaming for the gateway." This reverts commit 462191a08b5b2efb83f5bc32935dc546d35a744b. --- discord/gateway.py | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'discord/gateway.py') diff --git a/discord/gateway.py b/discord/gateway.py index eceb7a28..0ab02760 100644 --- a/discord/gateway.py +++ b/discord/gateway.py @@ -186,8 +186,6 @@ class DiscordWebSocket(websockets.client.WebSocketClientProtocol): # ws related stuff self.session_id = None self.sequence = None - self._zlib = zlib.decompressobj() - self._buffer = bytearray() @classmethod @asyncio.coroutine @@ -314,18 +312,8 @@ class DiscordWebSocket(websockets.client.WebSocketClientProtocol): self._dispatch('socket_raw_receive', msg) if isinstance(msg, bytes): - self._buffer.extend(msg) - - if len(msg) >= 4: - suffix = int.from_bytes(msg[-4:], byteorder='big') - if suffix == 0xFFFF: - msg = self._zlib.decompress(self._buffer) - msg = msg.decode('utf-8') - self._buffer = bytearray() - else: - return - else: - return + msg = zlib.decompress(msg, 15, 10490000) # This is 10 MiB + msg = msg.decode('utf-8') msg = json.loads(msg) -- cgit v1.2.3