From 9f687490dd7ec0b1bb12bff3fbf97aa34aab9d83 Mon Sep 17 00:00:00 2001 From: Tobias Oberstein Date: Sun, 6 Sep 2015 16:22:57 +0200 Subject: [PATCH] sublclass t.i.p.Factory for both clients and servers (fixes #389) --- autobahn/twisted/websocket.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/autobahn/twisted/websocket.py b/autobahn/twisted/websocket.py index 7fc613f3..1afb4200 100644 --- a/autobahn/twisted/websocket.py +++ b/autobahn/twisted/websocket.py @@ -227,11 +227,10 @@ class WebSocketAdapterFactory(object): log = make_logger("twisted") -class WebSocketServerFactory(WebSocketAdapterFactory, protocol.WebSocketServerFactory, twisted.internet.protocol.ServerFactory): +# we deliberately subclass t.i.p.Factory, not t.i.p.ServerFactory. See https://github.com/tavendo/AutobahnPython/issues/389 +class WebSocketServerFactory(WebSocketAdapterFactory, protocol.WebSocketServerFactory, twisted.internet.protocol.Factory): """ Base class for Twisted-based WebSocket server factories. - - .. seealso:: `twisted.internet.protocol.ServerFactory `_ """ def __init__(self, *args, **kwargs): @@ -250,11 +249,10 @@ class WebSocketServerFactory(WebSocketAdapterFactory, protocol.WebSocketServerFa protocol.WebSocketServerFactory.__init__(self, *args, **kwargs) -class WebSocketClientFactory(WebSocketAdapterFactory, protocol.WebSocketClientFactory, twisted.internet.protocol.ClientFactory): +# we deliberately subclass t.i.p.Factory, not t.i.p.ClientFactory. See https://github.com/tavendo/AutobahnPython/issues/389 +class WebSocketClientFactory(WebSocketAdapterFactory, protocol.WebSocketClientFactory, twisted.internet.protocol.Factory): """ Base class for Twisted-based WebSocket client factories. - - .. seealso:: `twisted.internet.protocol.ClientFactory `_ """ def __init__(self, *args, **kwargs):