Changeset 165:76a61f5aa343 for wokkel/subprotocols.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/subprotocols.py (modified) (5 diffs)

wokkel/subprotocols.py

@@ -8 +8 @@
 """
 
+__all__ = ['XMPPHandler', 'XMPPHandlerCollection', 'StreamManager',
+           'IQHandlerMixin']
+
 from zope.interface import implements
 
@@ -13 +16 @@
 from twisted.internet.error import ConnectionDone
 from twisted.python import failure, log
-from twisted.words.protocols.jabber import error, xmlstream
+from twisted.python.deprecate import deprecatedModuleAttribute
+from twisted.python.versions import Version
+from twisted.words.protocols.jabber import error, ijabber, xmlstream
 from twisted.words.protocols.jabber.xmlstream import toResponse
+from twisted.words.protocols.jabber.xmlstream import XMPPHandlerCollection
 from twisted.words.xish import xpath
 from twisted.words.xish.domish import IElement
 
-from wokkel.iwokkel import IXMPPHandler, IXMPPHandlerCollection
+deprecatedModuleAttribute(
+        Version("Wokkel", 0, 7, 0),
+        "Use twisted.words.protocols.jabber.xmlstream.XMPPHandlerCollection "
+                "instead.",
+        __name__,
+        "XMPPHandlerCollection")
 
 class XMPPHandler(object):
@@ -28 +39 @@
     """
 
-    implements(IXMPPHandler)
+    implements(ijabber.IXMPPHandler)
 
     def __init__(self):
@@ -105 +116 @@
         """
         return self.parent.request(request)
-
-
-
-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 handlers: List of protocol handlers.
-    @type handlers: L{list} of objects providing
-                      L{IXMPPHandler}
-    """
-
-    implements(IXMPPHandlerCollection)
-
-    def __init__(self):
-        self.handlers = []
-
-
-    def __iter__(self):
-        """
-        Act as a container for handlers.
-        """
-        return iter(self.handlers)
-
-
-    def addHandler(self, handler):
-        """
-        Add protocol handler.
-
-        Protocol handlers are expected to provide L{IXMPPHandler}.
-        """
-        self.handlers.append(handler)
-
-
-    def removeHandler(self, handler):
-        """
-        Remove protocol handler.
-        """
-        self.handlers.remove(handler)
 
 
@@ -476 +445 @@
 
         def fromStanzaError(failure, iq):
-            e = failure.trap(error.StanzaError)
+            failure.trap(error.StanzaError)
             return failure.value.toResponse(iq)