Changeset 35:2866eaae775f in ralphm-patches

Timestamp:

Feb 12, 2010, 12:01:52 PM (12 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Minor cleanups to deal with changed APIs

Files:

• client_service_example.patch (modified) (3 diffs)
• xmpp_client_service.patch (modified) (7 diffs)

client_service_example.patch

@@ -1 @@
-diff -r a0bcf2e586ec doc/examples/client_service.tac
+diff -r 0a3d1655a3e5 doc/examples/client_service.tac
 --- /dev/null   Thu Jan 01 00:00:00 1970 +0000
-+++ b/doc/examples/client_service.tac   Fri Feb 12 09:50:08 2010 +0100
-@@ -0,0 +1,40 @@
++++ b/doc/examples/client_service.tac   Fri Feb 12 11:55:08 2010 +0100
+@@ -0,0 +1,41 @@
 +from twisted.application import service
 +from twisted.internet import defer
@@ -8 +8 @@
 +from wokkel.client import ClientService
 +from wokkel.generic import FallbackHandler
-+from wokkel.xmppim import RosterProtocol
++from wokkel.xmppim import RosterServerProtocol
 +
 +import socket
 +domain = socket.gethostname()
 +
-+class StaticRoster(RosterProtocol):
++class StaticRoster(RosterServerProtocol):
 +
 +    def __init__(self):
++        RosterServerProtocol.__init__(self)
 +        self.roster = {'ralphm':
 +                           [{'jid': 'intosi@' + domain,
@@ -40 +41 @@
 +clientService = ClientService(domain, 5224)
 +clientService.logTraffic = True
-+clientService.addHandler(FallbackHandler())
-+clientService.addHandler(StaticRoster())
++FallbackHandler().setHandlerParent(clientService)
++StaticRoster().setHandlerParent(clientService)
 +clientService.setServiceParent(application)

xmpp_client_service.patch

@@ -1 +1 @@
 diff -r 67a42d8a1c73 wokkel/client.py
 --- a/wokkel/client.py  Fri Feb 12 09:31:19 2010 +0100
-+++ b/wokkel/client.py  Fri Feb 12 09:37:28 2010 +0100
-@@ -18,10 +18,11 @@
++++ b/wokkel/client.py  Fri Feb 12 11:46:41 2010 +0100
+@@ -17,11 +17,12 @@
+ from twisted.names.srvconnect import SRVConnector
  from twisted.python import log
  from twisted.words.protocols.jabber import client, error, sasl, xmlstream
- from twisted.words.protocols.jabber.jid import internJID as JID
+-from twisted.words.protocols.jabber.jid import internJID as JID
 -from twisted.words.xish import domish
++from twisted.words.protocols.jabber.jid import JID, internJID
 +from twisted.words.xish import domish, utility
  
@@ -12 +14 @@
 -from wokkel.subprotocols import StreamManager
 +from wokkel.compat import XmlStreamServerFactory
-+from wokkel.subprotocols import StreamManager, XMPPHandlerContainer
++from wokkel.subprotocols import StreamManager, XMPPHandlerCollection
  
  NS_CLIENT = 'jabber:client'
  
-@@ -350,3 +351,130 @@
+@@ -350,3 +351,132 @@
              reply['id'] = iq['id']
          reply.addElement((client.NS_XMPP_SESSION, 'session'))
@@ -44 +46 @@
 +
 +
-+class ClientService(XMPPHandlerContainer, service.Service):
++class ClientService(XMPPHandlerCollection, service.Service):
 +    """
 +    Service for accepting XMPP client connections.
@@ -58 +60 @@
 +    makes it easier to create adapters.
 +
-+    As an L{xmlstream.XMPPHandlerContainer}, this service creates a fake XML
++    As an L{xmlstream.XMPPHandlerCollection}, this service creates a fake XML
 +    stream that is passed to the XMPP subprotocol handlers. The received
 +    stanzas from the incoming client connections are passed on to the handlers
@@ -72 +74 @@
 +        self.port = port
 +
-+        self.factory = XmlStreamServerFactory(XMPPClientListenAuthenticator,
-+                                              self.domain)
++        def authenticatorFactory():
++            return XMPPClientListenAuthenticator(self.domain)
++
++        self.factory = XmlStreamServerFactory(authenticatorFactory)
 +        self.factory.addBootstrap(xmlstream.STREAM_CONNECTED_EVENT,
 +                                  self.makeConnection)
@@ -81 +85 @@
 +        self.streams = {}
 +
-+        XMPPHandlerContainer.__init__(self)
++        XMPPHandlerCollection.__init__(self)
 +
 +
@@ -141 +145 @@
 +        """
 +
-+        destination = JID(element["to"]).full()
++        destination = internJID(element["to"]).full()
 +
 +        if destination not in self.streams: