Mercurial > libervia-pubsub

changeset 140:d79f0816f6c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert changes to error handling into disco calls. Bump version.
author Ralph Meijer <ralphm@ik.nu>
date Wed, 27 Apr 2005 20:22:51 +0000
parents 8f6956b9a688
children d2c18d88f618
files idavoll/idavoll.py
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/idavoll/idavoll.py	Wed Apr 27 19:45:41 2005 +0000
+++ b/idavoll/idavoll.py	Wed Apr 27 20:22:51 2005 +0000
@@ -8,6 +8,8 @@
 
 import sys
 
+__version__ = '0.2'
+
 NS_VERSION = 'jabber:iq:version'
 
 IQ_GET = '/iq[@type="get"]'
@@ -39,7 +41,7 @@
         iq.swapAttributeValues("to", "from")
         iq["type"] = "result"
         name = iq.addElement("name", None, 'Idavoll')
-        version = iq.addElement("version", None, '0.1')
+        version = iq.addElement("version", None, __version__)
         self.send(iq)
         iq.handled = True
 
@@ -52,8 +54,8 @@
                 if hasattr(c, "get_disco_info"):
                     dl.append(c.get_disco_info(node))
         d = defer.DeferredList(dl, fireOnOneErrback=1, consumeErrors=1)
+        d.addCallback(self._disco_info_results, iq, node)
         d.addErrback(self._error, iq)
-        d.addCallback(self._disco_info_results, iq, node)
         d.addCallback(self.send)
 
         iq.handled = True
@@ -91,8 +93,8 @@
                 if hasattr(c, "get_disco_items"):
                     dl.append(c.get_disco_items(node))
         d = defer.DeferredList(dl, fireOnOneErrback=1, consumeErrors=1)
+        d.addCallback(self._disco_items_result, iq, node)
         d.addErrback(self._error, iq)
-        d.addCallback(self._disco_items_result, iq, node)
         d.addCallback(self.send)
         
         iq.handled = True