Changeset 165:76a61f5aa343 for wokkel/component.py

Timestamp:

Jan 22, 2012, 2:51:25 PM (10 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Cleanups leading up to Wokkel 0.7.0.

As we now depend on Twisted 10.0.0 or higher, the following classes and
interfaces were deprecated:

• wokkel.compat.BootstrapMixin?
• wokkel.compat.XmlStreamServerFactory?
• wokkel.iwokkel.IXMPPHandler
• wokkel.iwokkel.IXMPPHandlerCollection
• wokkel.subprotocols.XMPPHandlerCollection

This also resolves all Pyflakes warnings, changes links for www.xmpp.org to
xmpp.org and fixes the copyright notice in LICENSE to include 2012.

File:

• wokkel/component.py (modified) (6 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
@@ -79 +67 @@
 
 
-class InternalComponent(XMPPHandlerCollection, service.Service):
+class InternalComponent(xmlstream.XMPPHandlerCollection, service.Service):
     """
     Component service that connects directly to a router.
@@ -92 +80 @@
 
     def __init__(self, router, domain=None):
-        XMPPHandlerCollection.__init__(self)
+        xmlstream.XMPPHandlerCollection.__init__(self)
 
         self._router = router
@@ -138 +126 @@
         Add a new handler and connect it to the stream.
         """
-        XMPPHandlerCollection.addHandler(self, handler)
+        xmlstream.XMPPHandlerCollection.addHandler(self, handler)
 
         if self.xmlstream:
@@ -323 +311 @@
 
 
-class XMPPComponentServerFactory(XmlStreamServerFactory):
+class XMPPComponentServerFactory(xmlstream.XmlStreamServerFactory):
     """
     XMPP Component Server factory.
@@ -341 +329 @@
             return ListenComponentAuthenticator(self.secret)
 
-        XmlStreamServerFactory.__init__(self, authenticatorFactory)
+        xmlstream.XmlStreamServerFactory.__init__(self, authenticatorFactory)
         self.addBootstrap(xmlstream.STREAM_CONNECTED_EVENT,
                           self.makeConnection)