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

[Michael Gorven]

Update HTTP source for multiple features per processor.

[Stefano Rivera (stefanor)]

I'm ok with this as a 0.1 fix, but it's not applicable to trunk.

review: Approve

[Stefano Rivera (stefanor)]

Changing my mind on that. It's ok for trunk, if we document that the first feature is the primary one. We also need to rename feature -> features everywhere

[Jonathan Hitchcock (vhata)]

review: Approve

[Max Rabkin (max-rabkin)]

review: Approve

=== modified file 'ibid/plugins/__init__.py'
--- ibid/plugins/__init__.py	2010-03-02 19:01:47 +0000
+++ ibid/plugins/__init__.py	2010-03-23 15:30:38 +0000
@@ -259,7 +259,7 @@
     isLeaf = True
 
     def __init__(self):
-        ibid.rpc[self.feature] = self
+        ibid.rpc[self.feature[0]] = self
         self.form = templates.get_template('plugin_form.html')
         self.list = templates.get_template('plugin_functions.html')
 
@@ -306,7 +306,7 @@
                 if name.startswith('remote_'):
                     functions.append(name.replace('remote_', '', 1))
 
-            return self.list.render(object=self.feature, functions=functions) \
+            return self.list.render(object=self.feature[0], functions=functions) \
                     .encode('utf-8')
 
         args, varargs, varkw, defaults = getargspec(function)