Changeset 194:f1b586df427b for wokkel/subprotocols.py

Timestamp:

Oct 3, 2016, 8:49:10 AM (6 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

rebase_source:

77cb4411a2525cb7b972b664a751e11c11b7cf65

Message:

imported patch py3-subprotocols.patch

File:

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

wokkel/subprotocols.py

@@ -8 +8 @@
 """
 
-__all__ = ['XMPPHandler', 'XMPPHandlerCollection', 'StreamManager',
-           'IQHandlerMixin']
-
-from zope.interface import implements
+from __future__ import division, absolute_import
+
+from zope.interface import implementer
 
 from twisted.internet import defer
 from twisted.internet.error import ConnectionDone
 from twisted.python import failure, log
+from twisted.python.compat import iteritems, itervalues
 from twisted.python.deprecate import deprecatedModuleAttribute
 from twisted.python.versions import Version
@@ -31 +31 @@
         "XMPPHandlerCollection")
 
+@implementer(ijabber.IXMPPHandler)
 class XMPPHandler(object):
     """
@@ -38 +39 @@
     extension protocols, and are referred to as a subprotocol implementation.
     """
-
-    implements(ijabber.IXMPPHandler)
 
     def __init__(self):
@@ -278 +277 @@
         iqDeferreds = self._iqDeferreds
         self._iqDeferreds = {}
-        for d in iqDeferreds.itervalues():
+        for d in itervalues(iqDeferreds):
             d.errback(reason)
 
@@ -456 +455 @@
 
         handler = None
-        for queryString, method in self.iqHandlers.iteritems():
+        for queryString, method in iteritems(self.iqHandlers):
             if xpath.internQuery(queryString).matches(iq):
                 handler = getattr(self, method)
@@ -473 +472 @@
 
         iq.handled = True
+
+
+
+__all__ = ['XMPPHandler', 'XMPPHandlerCollection', 'StreamManager',
+           'IQHandlerMixin']