Changeset 205:e861fc4596ed for wokkel

Timestamp:

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

Author:

Ralph Meijer <ralphm@…>

Branch:

default

rebase_source:

59eec47f5c9c6add007ba950f0fa04a9d7cb2709

Message:

imported patch py3-component.patch

Location:

wokkel

Files:

• component.py (modified) (6 diffs)
• test/test_component.py (modified) (2 diffs)

wokkel/component.py

@@ -8 +8 @@
 """
 
+from __future__ import division, absolute_import
+
 from twisted.application import service
 from twisted.internet import reactor
 from twisted.python import log
+from twisted.python.compat import unicode
 from twisted.words.protocols.jabber.jid import internJID as JID
 from twisted.words.protocols.jabber import component, error, xmlstream
@@ -103 +106 @@
     allows for one-process XMPP servers.
 
-    @ivar domains: Domains (as C{str}) this component will handle traffic for.
-    @type domains: C{set}
+    @ivar domains: Domains (as L{unicode}) this component will handle traffic
+        for.
+    @type domains: L{set}
     """
 
@@ -174 +178 @@
 
     @ivar secret: The shared used to authorized incoming component connections.
-    @type secret: C{unicode}.
+    @type secret: L{unicode}.
     """
 
@@ -275 +279 @@
     stanzas they offer for routing.
 
-    A route destination of C{None} adds a default route. Traffic for which no
+    A route destination of L{None} adds a default route. Traffic for which no
     specific route exists, will be routed to this default route.
 
     @ivar routes: Routes based on the host part of JIDs. Maps host names to the
         L{EventDispatcher<twisted.words.xish.utility.EventDispatcher>}s that
-        should receive the traffic. A key of C{None} means the default route.
-    @type routes: C{dict}
+        should receive the traffic. A key of L{None} means the default route.
+    @type routes: L{dict}
     """
 
@@ -297 +301 @@
 
         @param destination: Destination of the route to be added as a host name
-                            or C{None} for the default route.
-        @type destination: C{str} or C{NoneType}
+                            or L{None} for the default route.
+        @type destination: L{unicode} or L{NoneType}
 
         @param xs: XML Stream to register the route for.
@@ -313 +317 @@
 
         @param destination: Destination of the route that should be removed.
-        @type destination: C{str}.
+        @type destination: L{unicode}
 
         @param xs: XML Stream to remove the route for.

wokkel/test/test_component.py

@@ -5 +5 @@
 Tests for L{wokkel.component}.
 """
+
+from __future__ import division, absolute_import
 
 from zope.interface.verify import verifyObject
@@ -313 +315 @@
         Test routing of a message using the default route.
 
-        The default route is the one with C{None} as its key in the
+        The default route is the one with L{None} as its key in the
         routing table. It is taken when there is no more specific route
         in the routing table that matches the stanza's destination.