Changeset 4:e8e7d5543a6f for wokkel/subprotocols.py

Timestamp:

Aug 22, 2007, 5:00:48 PM (15 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Convert:

svn:b33ecbfc-034c-dc11-8662-000475d9059e/trunk@5

Message:

Reverse how handlers are associated with the stream manager. Kick version.

File:

• wokkel/subprotocols.py (modified) (5 diffs)

wokkel/subprotocols.py

@@ -16 +16 @@
 from twisted.words.xish.domish import IElement
 
-from wokkel.iwokkel import IXMPPHandler
+from wokkel.iwokkel import IXMPPHandler, IXMPPHandlerCollection
 
 class XMPPHandler(object):
     implements(IXMPPHandler)
+
+    def setHandlerParent(self, parent):
+        self.parent = parent
+        self.parent.addHandler(self)
+
+    def disownHandlerParent(self, parent):
+        self.parent.removeHandler(self)
+        self.parent = None
 
     def makeConnection(self, xs):
@@ -49 +57 @@
                     L{xmlstream.XmlStream} for details.
         """
-        self.manager.send(obj)
-
-class XMPPHandlerContainer(object):
-    """
-    Container for XMPP subprotocol handlers.
-    """
+        self.parent.send(obj)
+
+
+class XMPPHandlerCollection(object):
+    """
+    Collection of XMPP subprotocol handlers.
+
+    This allows for grouping of subprotocol handlers, but is not an
+    L{XMPPHandler} itself, so this is not recursive.
+
+    @ivar xmlstream: Currently managed XML stream.
+    @type xmlstream: L{XmlStream}
+    @ivar handlers: List of protocol handlers.
+    @type handlers: L{list} of objects providing
+                      L{IXMPPHandler}
+    """
+
+    implements(IXMPPHandlerCollection)
 
     def __init__(self):
@@ -78 +98 @@
 
         self.handlers.append(handler)
-        handler.manager = self
 
         # get protocol handler up to speed when a connection has already
@@ -91 +110 @@
         """
 
-        handler.manager = None
         self.handlers.remove(handler)
 
-class StreamManager(XMPPHandlerContainer):
+class StreamManager(XMPPHandlerCollection):
     """
     Business logic representing a managed XMPP connection.
@@ -103 +121 @@
     using L{addHandler}.
 
-    @ivar xmlstream: currently managed XML stream
-    @type xmlstream: L{XmlStream}
-    @ivar handlers: list of protocol handlers
-    @type handlers: L{list} of objects providing
-                      L{IXMPPHandler}
     @ivar logTraffic: if true, log all traffic.
     @type logTraffic: L{bool}