Changeset 11:863dae6028a8

Timestamp:

Jan 15, 2008, 3:01:33 PM (15 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Convert:

svn:b33ecbfc-034c-dc11-8662-000475d9059e/trunk@39

Message:

Fix some small discovery glitches.

Location:

wokkel

Files:

• generic.py (modified) (1 diff)
• pubsub.py (modified) (2 diffs)

wokkel/generic.py

@@ -69 +69 @@
 
     def getDiscoInfo(self, requestor, target, node):
+        info = set()
+
         if not node:
-            return defer.succeed(set([disco.DiscoFeature(NS_VERSION)]))
+            info.add(disco.DiscoFeature(NS_VERSION))
+
+        return defer.succeed(info)
 
     def getDiscoItems(self, requestor, target, node):

wokkel/pubsub.py

@@ -388 +388 @@
                     return []
 
-                (nodeType, metaData) = nodeInfo
-                info.append(disco.Identity('pubsub', nodeType))
+                (nodeType, metaData) = nodeInfo['type'], nodeInfo['meta-data']
+                info.append(disco.DiscoIdentity('pubsub', nodeType))
                 if metaData:
                     form = data_form.Form(type="result",
@@ -404 +404 @@
                 return info
 
-            d = self.getNodeInfo(requestor, nodeIdentifier)
+            d = self.getNodeInfo(requestor, target, nodeIdentifier)
             d.addCallback(toInfo)
             return d