From 379e8f2c1771843ce1205a837a7439920f809f9e Mon Sep 17 00:00:00 2001 From: Guilhem Richard Date: Wed, 26 Apr 2017 17:33:18 +0200 Subject: [PATCH 1/2] JsonProtocol inherit of object --- txsockjs/protocols/websocket.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/txsockjs/protocols/websocket.py b/txsockjs/protocols/websocket.py index 0f4e36f..80c07e8 100644 --- a/txsockjs/protocols/websocket.py +++ b/txsockjs/protocols/websocket.py @@ -48,7 +48,7 @@ def getPeer(self): return address.IPv6Address("TCP", ip, None) return ProtocolWrapper.getPeer(self) -class JsonProtocol(PeerOverrideProtocol): +class JsonProtocol(PeerOverrideProtocol, object): def makeConnection(self, transport): directlyProvides(self, providedBy(transport)) Protocol.makeConnection(self, transport) From 356aadaf742c8c5c1d6d9ecf96af51fe44b87e5a Mon Sep 17 00:00:00 2001 From: Guilhem Richard Date: Wed, 26 Apr 2017 17:33:44 +0200 Subject: [PATCH 2/2] _WebSocketsProtocol inherit of object --- txsockjs/websockets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/txsockjs/websockets.py b/txsockjs/websockets.py index f982401..81e8758 100644 --- a/txsockjs/websockets.py +++ b/txsockjs/websockets.py @@ -263,7 +263,7 @@ def _parseFrames(buf): -class _WebSocketsProtocol(ProtocolWrapper): +class _WebSocketsProtocol(ProtocolWrapper, object): """ Protocol which wraps another protocol to provide a WebSockets transport layer.