Changeset 6:46e82ac33f4a in ralphm-patches for pubsub_request.patch


Ignore:
Timestamp:
Apr 2, 2009, 9:22:35 AM (12 years ago)
Author:
Ralph Meijer <ralphm@…>
Branch:
default
Message:

Add s2s code.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pubsub_request.patch

    r5 r6  
    1111that is passed to the corresponding handler methods.
    1212
    13 diff -r bcbcbc4aa868 wokkel/generic.py
    14 --- a/wokkel/generic.py Tue Mar 24 09:25:36 2009 +0100
    15 +++ b/wokkel/generic.py Wed Mar 25 18:13:56 2009 +0100
     13diff -r 0bfc0b2a633c wokkel/generic.py
     14--- a/wokkel/generic.py Wed Apr 01 17:25:11 2009 +0200
     15+++ b/wokkel/generic.py Wed Apr 01 17:26:46 2009 +0200
    1616@@ -10,7 +10,7 @@
    1717 from zope.interface import implements
    1818 
    19  from twisted.internet import defer
    20 -from twisted.words.protocols.jabber import error
    21 +from twisted.words.protocols.jabber import error, jid
     19 from twisted.internet import defer, protocol
     20-from twisted.words.protocols.jabber import error, xmlstream
     21+from twisted.words.protocols.jabber import error, jid, xmlstream
    2222 from twisted.words.protocols.jabber.xmlstream import toResponse
    2323 from twisted.words.xish import domish, utility
    2424 
    25 @@ -155,3 +155,34 @@
    26          self.sink = utility.EventDispatcher()
    27          self.source.send = lambda obj: self.sink.dispatch(obj)
     25@@ -162,6 +162,37 @@
    2826         self.sink.send = lambda obj: self.source.dispatch(obj)
    29 +
    30 +
     27 
     28 
    3129+
    3230+class Stanza(object):
     
    5856+            self.recipient = jid.internJID(element['to'])
    5957+        self.stanzaType = element.getAttribute('type')
    60 diff -r bcbcbc4aa868 wokkel/iwokkel.py
    61 --- a/wokkel/iwokkel.py Tue Mar 24 09:25:36 2009 +0100
    62 +++ b/wokkel/iwokkel.py Wed Mar 25 18:13:56 2009 +0100
     58+
     59+
     60 class DeferredXmlStreamFactory(BootstrapMixin, protocol.ClientFactory):
     61     protocol = xmlstream.XmlStream
     62 
     63diff -r 0bfc0b2a633c wokkel/iwokkel.py
     64--- a/wokkel/iwokkel.py Wed Apr 01 17:25:11 2009 +0200
     65+++ b/wokkel/iwokkel.py Wed Apr 01 17:26:46 2009 +0200
    6366@@ -278,6 +278,7 @@
    6467                              C{list} of L{domish.Element})
     
    340343+        @rtype: L{defer.Deferred}
    341344         """
    342 diff -r bcbcbc4aa868 wokkel/pubsub.py
    343 --- a/wokkel/pubsub.py  Tue Mar 24 09:25:36 2009 +0100
    344 +++ b/wokkel/pubsub.py  Wed Mar 25 18:13:56 2009 +0100
     345diff -r 0bfc0b2a633c wokkel/pubsub.py
     346--- a/wokkel/pubsub.py  Wed Apr 01 17:25:11 2009 +0200
     347+++ b/wokkel/pubsub.py  Wed Apr 01 17:26:46 2009 +0200
    345348@@ -16,7 +16,7 @@
    346349 from twisted.words.protocols.jabber import jid, error, xmlstream
     
    14121415+    def delete(self, request):
    14131416         raise Unsupported('delete-nodes')
    1414 diff -r bcbcbc4aa868 wokkel/test/test_pubsub.py
    1415 --- a/wokkel/test/test_pubsub.py        Tue Mar 24 09:25:36 2009 +0100
    1416 +++ b/wokkel/test/test_pubsub.py        Wed Mar 25 18:13:56 2009 +0100
     1417diff -r 0bfc0b2a633c wokkel/test/test_pubsub.py
     1418--- a/wokkel/test/test_pubsub.py        Wed Apr 01 17:25:11 2009 +0200
     1419+++ b/wokkel/test/test_pubsub.py        Wed Apr 01 17:26:46 2009 +0200
    14171420@@ -14,6 +14,7 @@
    14181421 from twisted.words.protocols.jabber.jid import JID
Note: See TracChangeset for help on using the changeset viewer.