Changeset 98:c3b20ad2bb70 for wokkel/subprotocols.py

Timestamp:

Mar 7, 2011, 7:40:16 PM (11 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Track change in Twisted Words, to pass a reason Failure with STREAM_END_EVENT.

File:

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

wokkel/subprotocols.py

@@ -11 +11 @@
 
 from twisted.internet import defer
-from twisted.python import log
+from twisted.internet.error import ConnectionDone
+from twisted.python import failure, log
 from twisted.words.protocols.jabber import error, xmlstream
 from twisted.words.protocols.jabber.xmlstream import toResponse
@@ -247 +248 @@
 
 
-    def _disconnected(self, _):
+    def _disconnected(self, reason):
         """
         Called when the stream has been closed.
@@ -258 +259 @@
         self._initialized = False
 
+        # Twisted versions before 11.0 passed an XmlStream here.
+        if not hasattr(reason, 'trap'):
+            reason = failure.Failure(ConnectionDone())
+
         # Notify all child services which implement
         # the IService interface
         for e in self:
-            e.connectionLost(None)
+            e.connectionLost(reason)