Changeset 753

Timestamp:

07/31/08 10:24:21 (4 months ago)

Author:

sylvain

Message:

more PubSub? coverage

Files:

• oss/headstock/headstock/api/discovery.py (modified) (5 diffs)
• oss/headstock/headstock/api/im.py (modified) (1 diff)
• oss/headstock/headstock/api/pubsub.py (modified) (2 diffs)
• oss/headstock/headstock/protocol/core/message.py (modified) (1 diff)
• oss/headstock/headstock/protocol/extension/pubsub.py (modified) (1 diff)

oss/headstock/headstock/api/discovery.py

@@ -64 +64 @@
-    def __init__(self, from_jid, to_jid, node_name=None, type=u'get', stanza_id=None):
-        Entity.__init__(self, from_jid, to_jid, type, stanza_id)
-data_form
+x
-        self.node_name = node_name
-        self.identities = []
@@ -117 +117 @@
-                            disco.items.append(item)
-                    elif i.xml_ns == XMPP_DATA_FORM_NS:
-data_form
+x
-            elif c.xml_ns == XMPP_CLIENT_NS and c.xml_name == 'error':
-                disco.error = Error.from_element(c)
@@ -253 +253 @@
-    def __init__(self, from_jid, to_jid, node_name=None, type=u'get', stanza_id=None):
-        Entity.__init__(self, from_jid, to_jid, type, stanza_id)
-data_form
+x
-        self.node_name = node_name
-ies = []
+y = None
-        self.features = []
-        self.items = []
@@ -287 +287 @@
-                                             i.get_attribute_value('category'),
-                                             i.get_attribute_value('type'))
-ies.append(ident)
+y = ident
-                        elif i.xml_name == 'feature':
-                            feat = Feature(i.get_attribute_value('var'))
@@ -298 +298 @@
-                            disco.items.append(item)
-                    elif i.xml_ns == XMPP_DATA_FORM_NS:
-data_form
-
-
-
+x
+
+
+

oss/headstock/headstock/api/im.py

@@ -5 +5 @@
-
-from xml.sax.saxutils import unescape
+    
-from datetime import datetime
-

oss/headstock/headstock/api/pubsub.py

@@ -317 +317 @@
-        attrs = {u'node': e.node_name}
-        items = E(u'items', attributes=attrs, namespace=XMPP_PUBSUB_NS, parent=pubsub)
-
-
+
+
+
-
-        return iq
@@ -345 +346 @@
-
-        return node
-        
-    
+    from_request_all_items = from_request_item
+    to_request_all_items = to_request_item
+

oss/headstock/headstock/protocol/core/message.py

@@ -25 +25 @@
-    
-    def __init__(self):
- 
+
-
-    def main(self):

oss/headstock/headstock/protocol/extension/pubsub.py

@@ -726 +726 @@
-        self.link((self, 'in.retrieve.result'), (itemretrievedisp, 'forward'), passthrough=1)
-        self.link((self, 'in.retrieve.error'), (itemretrievedisp, 'forward'), passthrough=1)
+        self.link((self, 'retrieve.all.inbox'), (itemretrievedisp, 'inbox'), passthrough=1)
+        self.link((self, 'retrieve.all.forward'), (itemretrievedisp, 'forward'), passthrough=1)
+        self.link((self, 'in.retrieve.get'), (itemretrievedisp, 'forward'), passthrough=1)
+        self.link((self, 'in.retrieve.set'), (itemretrievedisp, 'forward'), passthrough=1)
+        self.link((self, 'in.retrieve.result'), (itemretrievedisp, 'forward'), passthrough=1)
+        self.link((self, 'in.retrieve.error'), (itemretrievedisp, 'forward'), passthrough=1)
-        self.link((itemretrievedisp, 'outbox'), (self, 'retrieve.outbox'), passthrough=2)
-        self.link((itemretrievedisp, 'xmpp.get'), (self, 'out.retrieve.get'), passthrough=2)