Changeset 6:46e82ac33f4a in ralphm-patches

Timestamp:

Apr 2, 2009, 9:22:35 AM (12 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Add s2s code.

Files:

• deferred_xmlstream_factory.patch (added)
• pubsub_request.patch (modified) (4 diffs)
• s2s.patch (added)
• series (modified) (1 diff)

pubsub_request.patch

@@ -11 +11 @@
 that is passed to the corresponding handler methods.
 
-diff -r bcbcbc4aa868 wokkel/generic.py
---- a/wokkel/generic.py Tue Mar 24 09:25:36 2009 +0100
-+++ b/wokkel/generic.py Wed Mar 25 18:13:56 2009 +0100
+diff -r 0bfc0b2a633c wokkel/generic.py
+--- a/wokkel/generic.py Wed Apr 01 17:25:11 2009 +0200
++++ b/wokkel/generic.py Wed Apr 01 17:26:46 2009 +0200
 @@ -10,7 +10,7 @@
  from zope.interface import implements
  
- from twisted.internet import defer
--from twisted.words.protocols.jabber import error
-+from twisted.words.protocols.jabber import error, jid
+ from twisted.internet import defer, protocol
+-from twisted.words.protocols.jabber import error, xmlstream
++from twisted.words.protocols.jabber import error, jid, xmlstream
  from twisted.words.protocols.jabber.xmlstream import toResponse
  from twisted.words.xish import domish, utility
  
-@@ -155,3 +155,34 @@
-         self.sink = utility.EventDispatcher()
-         self.source.send = lambda obj: self.sink.dispatch(obj)
+@@ -162,6 +162,37 @@
          self.sink.send = lambda obj: self.source.dispatch(obj)
-+
-+
+ 
+ 
 +
 +class Stanza(object):
@@ -58 +56 @@
 +            self.recipient = jid.internJID(element['to'])
 +        self.stanzaType = element.getAttribute('type')
-diff -r bcbcbc4aa868 wokkel/iwokkel.py
---- a/wokkel/iwokkel.py Tue Mar 24 09:25:36 2009 +0100
-+++ b/wokkel/iwokkel.py Wed Mar 25 18:13:56 2009 +0100
++
++
+ class DeferredXmlStreamFactory(BootstrapMixin, protocol.ClientFactory):
+     protocol = xmlstream.XmlStream
+ 
+diff -r 0bfc0b2a633c wokkel/iwokkel.py
+--- a/wokkel/iwokkel.py Wed Apr 01 17:25:11 2009 +0200
++++ b/wokkel/iwokkel.py Wed Apr 01 17:26:46 2009 +0200
 @@ -278,6 +278,7 @@
                               C{list} of L{domish.Element})
@@ -340 +343 @@
 +        @rtype: L{defer.Deferred}
          """
-diff -r bcbcbc4aa868 wokkel/pubsub.py
---- a/wokkel/pubsub.py  Tue Mar 24 09:25:36 2009 +0100
-+++ b/wokkel/pubsub.py  Wed Mar 25 18:13:56 2009 +0100
+diff -r 0bfc0b2a633c wokkel/pubsub.py
+--- a/wokkel/pubsub.py  Wed Apr 01 17:25:11 2009 +0200
++++ b/wokkel/pubsub.py  Wed Apr 01 17:26:46 2009 +0200
 @@ -16,7 +16,7 @@
  from twisted.words.protocols.jabber import jid, error, xmlstream
@@ -1412 +1415 @@
 +    def delete(self, request):
          raise Unsupported('delete-nodes')
-diff -r bcbcbc4aa868 wokkel/test/test_pubsub.py
---- a/wokkel/test/test_pubsub.py        Tue Mar 24 09:25:36 2009 +0100
-+++ b/wokkel/test/test_pubsub.py        Wed Mar 25 18:13:56 2009 +0100
+diff -r 0bfc0b2a633c wokkel/test/test_pubsub.py
+--- a/wokkel/test/test_pubsub.py        Wed Apr 01 17:25:11 2009 +0200
++++ b/wokkel/test/test_pubsub.py        Wed Apr 01 17:26:46 2009 +0200
 @@ -14,6 +14,7 @@
  from twisted.words.protocols.jabber.jid import JID

series

@@ +1 @@
+component_multiple.patch
+deferred_xmlstream_factory.patch
+s2s.patch
 data_form_parse_type.patch
 pubsub_request.patch
-component_multiple.patch
 pubsub_client_sender.patch
 pubsub_resource.patch