Merge lp:~mgorven/ibid/http-features-fix into lp:~ibid-core/ibid/old-trunk-1.6

Proposed by Stefano Rivera
Status: Merged
Approved by: Stefano Rivera
Approved revision: 924
Merged at revision: 918
Proposed branch: lp:~mgorven/ibid/http-features-fix
Merge into: lp:~ibid-core/ibid/old-trunk-1.6
Diff against target: 21 lines (+2/-2)
1 file modified
ibid/plugins/__init__.py (+2/-2)
To merge this branch: bzr merge lp:~mgorven/ibid/http-features-fix
Reviewer Review Type Date Requested Status
Ibid Core Team Pending
Review via email: mp+22302@code.launchpad.net

Commit message

Treat the Processor's first feature as the primary feature in RPC

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ibid/plugins/__init__.py'
2--- ibid/plugins/__init__.py 2010-03-02 19:01:47 +0000
3+++ ibid/plugins/__init__.py 2010-03-27 17:01:26 +0000
4@@ -259,7 +259,7 @@
5 isLeaf = True
6
7 def __init__(self):
8- ibid.rpc[self.feature] = self
9+ ibid.rpc[self.feature[0]] = self
10 self.form = templates.get_template('plugin_form.html')
11 self.list = templates.get_template('plugin_functions.html')
12
13@@ -306,7 +306,7 @@
14 if name.startswith('remote_'):
15 functions.append(name.replace('remote_', '', 1))
16
17- return self.list.render(object=self.feature, functions=functions) \
18+ return self.list.render(object=self.feature[0], functions=functions) \
19 .encode('utf-8')
20
21 args, varargs, varkw, defaults = getargspec(function)

Subscribers

People subscribed via source and target branches