From 7fd0863a0d8653f0aceb77d69f7e6928ab2fe212 Mon Sep 17 00:00:00 2001 From: andrei Date: Fri, 27 Oct 2017 18:32:33 -0700 Subject: [PATCH] [gateway] fix using etf encoder with new zlib-stream --- disco/gateway/client.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/disco/gateway/client.py b/disco/gateway/client.py index a11d27f..92ad7ff 100644 --- a/disco/gateway/client.py +++ b/disco/gateway/client.py @@ -3,6 +3,8 @@ import zlib import six import ssl +from websocket import ABNF + from disco.gateway.packets import OPCode, RECV, SEND from disco.gateway.events import GatewayEvent from disco.gateway.encoding import ENCODERS @@ -151,7 +153,10 @@ class GatewayClient(LoggingClass): if msg[-4:] != ZLIB_SUFFIX: return - msg = self._zlib.decompress(self._buffer if six.PY3 else str(self._buffer)).decode('utf-8') + msg = self._zlib.decompress(self._buffer if six.PY3 else str(self._buffer)) + # If this encoder is text based, we want to decode the data as utf8 + if self.encoder.OPCODE == ABNF.OPCODE_TEXT: + msg = msg.decode('utf-8') self._buffer = None else: # Detect zlib and decompress