Changeset 41:72fa7b817767 for wokkel

Timestamp:

Oct 18, 2008, 12:40:56 PM (14 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Convert:

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

Message:

Compatibility fixes for Twisted 8.0 and 8.1.

Location:

wokkel

Files:

• component.py (modified) (7 diffs)
• test/test_component.py (modified) (5 diffs)

wokkel/component.py

@@ -15 +15 @@
 from twisted.words.xish import domish
 
+try:
+    #from twisted.words.protocols.jabber.xmlstream import XMPPHandler
+    from twisted.words.protocols.jabber.xmlstream import XMPPHandlerCollection
+except ImportError:
+    #from wokkel.subprotocols import XMPPHandler
+    from wokkel.subprotocols import XMPPHandlerCollection
+
+try:
+    from twisted.words.protocols.jabber.xmlstream import XmlStreamServerFactory
+except ImportError:
+    from wokkel.compat import XmlStreamServerFactory
+
 from wokkel.generic import XmlPipe
 from wokkel.subprotocols import StreamManager
@@ -67 +79 @@
 
 
-class InternalComponent(xmlstream.XMPPHandlerCollection, service.Service):
+class InternalComponent(XMPPHandlerCollection, service.Service):
     """
     Component service that connects directly to a router.
@@ -77 +89 @@
 
     def __init__(self, router, domain):
-        xmlstream.XMPPHandlerCollection.__init__(self)
+        XMPPHandlerCollection.__init__(self)
         self.router = router
         self.domain = domain
@@ -116 +128 @@
         Add a new handler and connect it to the stream.
         """
-        xmlstream.XMPPHandlerCollection.addHandler(self, handler)
+        XMPPHandlerCollection.addHandler(self, handler)
 
         if self.xmlstream:
@@ -169 +181 @@
         xmlstream.ListenAuthenticator.streamStarted(self, rootElement)
 
-        # Compatibility fix
+        # Compatibility fix for pre-8.2 implementations of ListenAuthenticator
         if not self.xmlstream.sid:
             from twisted.python import randbytes
@@ -300 +312 @@
 
 
-class XMPPComponentServerFactory(xmlstream.XmlStreamServerFactory):
+class XMPPComponentServerFactory(XmlStreamServerFactory):
     """
     XMPP Component Server factory.
@@ -318 +330 @@
             return ListenComponentAuthenticator(self.secret)
 
-        xmlstream.XmlStreamServerFactory.__init__(self, authenticatorFactory)
+        XmlStreamServerFactory.__init__(self, authenticatorFactory)
         self.addBootstrap(xmlstream.STREAM_CONNECTED_EVENT,
                           self.makeConnection)

wokkel/test/test_component.py

@@ -15 +15 @@
 from twisted.words.xish import domish
 
+try:
+    from twisted.words.protocols.jabber.ijabber import IXMPPHandlerCollection
+    from twisted.words.protocols.jabber.xmlstream import XMPPHandler
+except ImportError:
+    from wokkel.subprotocols import IXMPPHandlerCollection, XMPPHandler
+
 from wokkel import component
 from wokkel.generic import XmlPipe
@@ -31 +37 @@
         """
         L{component.InternalComponent} implements
-        L{ijabber.IXMPPHandlerCollection}.
-        """
-        verifyObject(ijabber.IXMPPHandlerCollection, self.component)
+        L{IXMPPHandlerCollection}.
+        """
+        verifyObject(IXMPPHandlerCollection, self.component)
 
 
@@ -43 +49 @@
         events = []
 
-        class TestHandler(xmlstream.XMPPHandler):
+        class TestHandler(XMPPHandler):
 
             def connectionInitialized(self):
@@ -70 +76 @@
         events = []
 
-        class TestHandler(xmlstream.XMPPHandler):
+        class TestHandler(XMPPHandler):
 
             def connectionLost(self, reason):
@@ -91 +97 @@
         events = []
 
-        class TestHandler(xmlstream.XMPPHandler):
+        class TestHandler(XMPPHandler):
 
             def connectionInitialized(self):