Changeset 11:863dae6028a8


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • wokkel/generic.py

    r6 r11  
    6969
    7070    def getDiscoInfo(self, requestor, target, node):
     71        info = set()
     72
    7173        if not node:
    72             return defer.succeed(set([disco.DiscoFeature(NS_VERSION)]))
     74            info.add(disco.DiscoFeature(NS_VERSION))
     75
     76        return defer.succeed(info)
    7377
    7478    def getDiscoItems(self, requestor, target, node):
  • wokkel/pubsub.py

    r10 r11  
    388388                    return []
    389389
    390                 (nodeType, metaData) = nodeInfo
    391                 info.append(disco.Identity('pubsub', nodeType))
     390                (nodeType, metaData) = nodeInfo['type'], nodeInfo['meta-data']
     391                info.append(disco.DiscoIdentity('pubsub', nodeType))
    392392                if metaData:
    393393                    form = data_form.Form(type="result",
     
    404404                return info
    405405
    406             d = self.getNodeInfo(requestor, nodeIdentifier)
     406            d = self.getNodeInfo(requestor, target, nodeIdentifier)
    407407            d.addCallback(toInfo)
    408408            return d
Note: See TracChangeset for help on using the changeset viewer.