Merge lp:~stefanor/ibid/rename-feature-attr into lp:~ibid-core/ibid/old-trunk-1.6

[Stefano Rivera]

Rename Processor.feature -> features as we changed it to a list

This should have been done before 0.1.0

[lp:~stefanor/ibid/rename-feature-attr]

920. By Stefano Rivera on 2010-03-27

Merge from trunk

[Max Rabkin (max-rabkin)]

Is this important enough to backport?

[Stefano Rivera (stefanor)]

No, it's an API change. For 2.x I think.

[Michael Gorven (mgorven)]

Looks fine.
 review approve

review: Approve

[Max Rabkin (max-rabkin)]

Oops, for some reason I thought you were proposing to merge this into 0.1.

review: Approve

[Keegan Carruthers-Smith (keegan-csmith)]

Looked for anything you may have missed out, couldn't find anything. Approve

review: Approve

=== modified file 'docs/api/ibid.plugins.rst'
--- docs/api/ibid.plugins.rst	2010-03-02 20:37:03 +0000
+++ docs/api/ibid.plugins.rst	2010-03-27 17:38:22 +0000
@@ -31,7 +31,7 @@
 
       Default: ``None``
 
-   .. attribute:: feature
+   .. attribute:: features
 
       List: Strings naming each feature that this Processor is part of.
       Used in locating "usage" strings for on-line documentation.
 
=== modified file 'docs/tutorial.rst'
--- docs/tutorial.rst	2010-03-02 20:51:25 +0000
+++ docs/tutorial.rst	2010-03-27 17:38:22 +0000
@@ -247,7 +247,7 @@
    class Dice(Processor):
        usage = u'roll <number> dice'
 
-       feature = ('dice',)
+       features = ('dice',)
 
        @match(r'^roll\s+(\d+)\s+dic?e$')
        def multithrow(self, event, number):
@@ -262,7 +262,7 @@
 and if necessary add a category to it from your module.
 
 The Processor can be linked to a feature by specifying it in the
-`feature` attribute.
+`features` attribute.
 Usage for the Processor's functions (in BNF) goes in a `usage`
 attribute.
 "reload tutorial" and you should see "dice" appear in the features for
 
=== modified file 'ibid/plugins/__init__.py'
--- ibid/plugins/__init__.py	2010-03-23 15:21:27 +0000
+++ ibid/plugins/__init__.py	2010-03-27 17:38:22 +0000
@@ -259,7 +259,7 @@
     isLeaf = True
 
     def __init__(self):
-        ibid.rpc[self.feature[0]] = self
+        ibid.rpc[self.features[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[0], functions=functions) \
+            return self.list.render(object=self.features[0], functions=functions) \
                     .encode('utf-8')
 
         args, varargs, varkw, defaults = getargspec(function)
 
=== modified file 'ibid/plugins/admin.py'
--- ibid/plugins/admin.py	2010-02-20 21:58:38 +0000
+++ ibid/plugins/admin.py	2010-03-27 17:38:22 +0000
@@ -21,7 +21,7 @@
 }
 class ListPLugins(Processor):
     usage = u'list plugins'
-    feature = ('plugins',)
+    features = ('plugins',)
 
     @match(r'^lsmod|list\s+plugins$')
     def handler(self, event):
@@ -38,7 +38,7 @@
 }
 class ReloadCoreModules(Processor):
     usage = u'reload (reloader|dispatcher|databases|auth)'
-    feature = ('core',)
+    features = ('core',)
 
     priority = -5
     permission = u'core'
@@ -56,7 +56,7 @@
 
 class LoadModules(Processor):
     usage = u'(load|unload|reload) <plugin|processor>'
-    feature = ('plugins',)
+    features = ('plugins',)
 
     permission = u'plugins'
 
@@ -79,7 +79,7 @@
 }
 class Die(Processor):
     usage = u'die'
-    feature = ('die',)
+    features = ('die',)
 
     permission = u'admin'
 
@@ -95,7 +95,7 @@
 class Admin(Processor):
     usage = u"""(connect|disconnect) (to|from) <source>
     load <source> source"""
-    feature = ('sources',)
+    features = ('sources',)
 
     permission = u'sources'
 
@@ -129,7 +129,7 @@
 
 class Info(Processor):
     usage = u'(sources|list configured sources)'
-    feature = ('sources',)
+    features = ('sources',)
 
     @match(r'^sources$')
     def list(self, event):
@@ -149,7 +149,7 @@
 }
 class Version(Processor):
     usage = u'version'
-    feature = ('version',)
+    features = ('version',)
 
     @match(r'^version$')
     def show_version(self, event):
@@ -167,7 +167,7 @@
     usage = u"""reread config
     set config <name> to <value>
     get config <name>"""
-    feature = ('config',)
+    features = ('config',)
 
     priority = -10
     permission = u'config'
 
=== modified file 'ibid/plugins/ascii.py'
--- ibid/plugins/ascii.py	2010-02-20 21:58:38 +0000
+++ ibid/plugins/ascii.py	2010-03-27 17:38:22 +0000
@@ -35,7 +35,7 @@
 }
 class DrawImage(Processor):
     usage = u'draw <url> [in colour] [width <width>] [height <height>]'
-    feature = ('draw-aa',)
+    features = ('draw-aa',)
 
     max_filesize = IntOption('max_filesize', 'Only request this many KiB', 200)
     def_height = IntOption('def_height', 'Default height for libaa output', 10)
@@ -153,7 +153,7 @@
 class WriteFiglet(Processor):
     usage = u"""figlet <text> [in <font>]
     list figlet fonts [from <index>]"""
-    feature = ('figlet',)
+    features = ('figlet',)
 
     max_width = IntOption('max_width', 'Maximum width for ascii output', 60)
     fonts_ = Option('fonts', 'Directory or Zip file containing figlet fonts',
 
=== modified file 'ibid/plugins/buildbot.py'
--- ibid/plugins/buildbot.py	2010-02-20 21:58:38 +0000
+++ ibid/plugins/buildbot.py	2010-03-27 17:38:22 +0000
@@ -15,7 +15,7 @@
 }}
 class BuildBot(Processor, RPC):
     usage = u'rebuild <branch> [ (revision|r) <number> ]'
-    feature = ('buildbot',)
+    features = ('buildbot',)
     autoload = False
 
     server = Option('server', 'Buildbot server hostname', 'localhost')
 
=== modified file 'ibid/plugins/bzr.py'
--- ibid/plugins/bzr.py	2010-02-21 09:45:01 +0000
+++ ibid/plugins/bzr.py	2010-03-27 17:38:22 +0000
@@ -62,7 +62,7 @@
 class Bazaar(Processor, RPC):
     usage = u"""(last commit|commit <revno>) [to <repo>] [full]
     repositories"""
-    feature = ('bzr',)
+    features = ('bzr',)
     autoload = False
 
     repositories = DictOption('repositories', 'Dict of repositories names and URLs')
 
=== modified file 'ibid/plugins/calc.py'
--- ibid/plugins/calc.py	2010-02-24 12:55:40 +0000
+++ ibid/plugins/calc.py	2010-03-27 17:38:22 +0000
@@ -37,7 +37,7 @@
 class BC(Processor):
     usage = u'bc <expression>'
 
-    feature = ('bc',)
+    features = ('bc',)
 
     bc = Option('bc', 'Path to bc executable', 'bc')
     bc_timeout = FloatOption('bc_timeout', 'Maximum BC execution time (sec)', 2.0)
@@ -141,7 +141,7 @@
 
 class Calc(Processor):
     usage = u'<expression>'
-    feature = ('calc',)
+    features = ('calc',)
 
     priority = 500
 
@@ -212,7 +212,7 @@
 }
 class Random(Processor):
     usage = u'random [ <max> | <min> <max> ]'
-    feature = ('random',)
+    features = ('random',)
 
     @match('^rand(?:om)?(?:\s+(\d+)(?:\s+(\d+))?)?$')
     def random(self, event, begin, end):
 
=== modified file 'ibid/plugins/codecontest.py'
--- ibid/plugins/codecontest.py	2010-02-20 21:58:38 +0000
+++ ibid/plugins/codecontest.py	2010-03-27 17:38:22 +0000
@@ -38,7 +38,7 @@
     admin_user = Option('admin_user', 'Admin user on USACO', None)
     admin_password = Option('admin_password', 'Admin password on USACO', None)
 
-    feature = ('usaco',)
+    features = ('usaco',)
     # Clashes with identity, so lower our priority since if we match, then
     # this is the better match
     priority = -20
 
=== modified file 'ibid/plugins/conversions.py'
--- ibid/plugins/conversions.py	2010-03-20 11:27:28 +0000
+++ ibid/plugins/conversions.py	2010-03-27 17:38:22 +0000
@@ -9,6 +9,7 @@
 
 import ibid
 from ibid.plugins import Processor, handler, match
+from ibid.compat import any
 from ibid.config import Option
 from ibid.utils import file_in_path, get_country_codes, human_join, \
                        unicode_output
@@ -26,7 +27,7 @@
     [convert] ascii <text> to base <number>
     [convert] <sequence> from base <number> to ascii"""
 
-    feature = ('base',)
+    features = ('base',)
 
     abbr_named_bases = {
             "hex": 16,
@@ -173,7 +174,8 @@
             'base': self._base_name(base_to),
         })
 
-        if base_to == 64 and [True for plugin in ibid.processors if getattr(plugin, 'feature', None) == 'base64']:
+        if base_to == 64 and any(True for plugin in ibid.processors
+                if 'base64' in getattr(plugin, 'features', [])):
             event.addresponse(u'If you want a base64 encoding, use the "base64" feature')
 
     @handler
@@ -213,7 +215,8 @@
             return
 
         event.addresponse(u'That is "%s"', output)
-        if base_from == 64 and [True for plugin in ibid.processors if getattr(plugin, 'feature', None) == 'base64']:
+        if base_from == 64 and any(True for plugin in ibid.processors
+                if 'base64' in getattr(plugin, 'features', [])):
             event.addresponse(u'If you want a base64 encoding, use the "base64" feature')
 
 features['units'] = {
@@ -222,7 +225,7 @@
 }
 class Units(Processor):
     usage = u'convert [<value>] <unit> to <unit>'
-    feature = ('units',)
+    features = ('units',)
     priority = 10
 
     units = Option('units', 'Path to units executable', 'units')
@@ -303,7 +306,7 @@
     usage = u"""exchange <amount> <currency> for <currency>
     currencies for <country>"""
 
-    feature = ('currency',)
+    features = ('currency',)
 
     headers = {'User-Agent': 'Mozilla/5.0', 'Referer': 'http://www.xe.com/'}
     currencies = {}
@@ -433,7 +436,7 @@
     usage = u"""U+<hex code>
     unicode (<character>|<character name>|<decimal code>|0x<hex code>)"""
 
-    feature = ('unicode',)
+    features = ('unicode',)
 
     bidis = {'AL': u'right-to-left Arabic', 'AN': u'Arabic number',
              'B': u'paragraph separator', 'BN': u'boundary neutral',
 
=== modified file 'ibid/plugins/eval.py'
--- ibid/plugins/eval.py	2010-02-20 21:58:38 +0000
+++ ibid/plugins/eval.py	2010-03-27 17:38:22 +0000
@@ -20,7 +20,7 @@
 
 class Python(Processor):
     usage = u'py <code>'
-    feature = ('eval',)
+    features = ('eval',)
 
     permission = u'eval'
 
@@ -40,7 +40,7 @@
 
 class Perl(Processor):
     usage = u'pl <code>'
-    feature = ('eval',)
+    features = ('eval',)
 
     permission = u'eval'
 
@@ -56,7 +56,7 @@
 
 class Lua(Processor):
     usage = u'lua <code>'
-    feature = ('eval',)
+    features = ('eval',)
 
     permission = u'eval'
 
 
=== modified file 'ibid/plugins/factoid.py'
--- ibid/plugins/factoid.py	2010-02-24 12:42:45 +0000
+++ ibid/plugins/factoid.py	2010-03-27 17:38:22 +0000
@@ -267,7 +267,7 @@
 
 class Utils(Processor):
     usage = u'literal <name> [( #<from number> | /<pattern>/[r] )]'
-    feature = ('factoid',)
+    features = ('factoid',)
 
     @match(r'^literal\s+(.+?)(?:\s+#(\d+)|\s+(?:/(.+?)/(r?)))?$')
     def literal(self, event, name, number, pattern, is_regex):
@@ -282,7 +282,7 @@
 class Forget(Processor):
     usage = u"""forget <name> [( #<number> | /<pattern>/[r] )]
     <name> is the same as <other name>"""
-    feature = ('factoid',)
+    features = ('factoid',)
 
     priority = 10
     permission = u'factoid'
@@ -378,7 +378,7 @@
 
 class Search(Processor):
     usage = u'search [for] [<limit>] [(facts|values) [containing]] (<pattern>|/<pattern>/[r]) [from <start>]'
-    feature = ('factoid',)
+    features = ('factoid',)
 
     limit = IntOption('search_limit', u'Maximum number of results to return', 30)
     default = IntOption('search_default', u'Default number of results to return', 10)
@@ -453,7 +453,7 @@
 
 class Get(Processor, RPC):
     usage = u'<factoid> [( #<number> | /<pattern>/[r] )]'
-    feature = ('factoid',)
+    features = ('factoid',)
 
     priority = 200
 
@@ -505,7 +505,7 @@
 class Set(Processor):
     usage = u"""<name> (<verb>|=<verb>=) [also] <value>
     last set factoid"""
-    feature = ('factoid',)
+    features = ('factoid',)
 
     interrogatives = ListOption('interrogatives', 'Question words to strip', default_interrogatives)
     verbs = ListOption('verbs', 'Verbs that split name from value', default_verbs)
@@ -583,7 +583,7 @@
 class Modify(Processor):
     usage = u"""<name> [( #<number> | /<pattern>/[r] )] += <suffix>
     <name> [( #<number> | /<pattern>/[r] )] ~= ( s/<regex>/<replacement>/[g][i][r] | y/<source>/<dest>/ )"""
-    feature = ('factoid',)
+    features = ('factoid',)
 
     permission = u'factoid'
     permissions = (u'factoidadmin',)
 
=== modified file 'ibid/plugins/feeds.py'
--- ibid/plugins/feeds.py	2010-02-20 21:58:38 +0000
+++ ibid/plugins/feeds.py	2010-03-27 17:38:22 +0000
@@ -103,7 +103,7 @@
     poll <name> feed notify <channel> on <source>
     stop polling <name> feed
     """
-    feature = ('feeds',)
+    features = ('feeds',)
 
     permission = u'feeds'
 
@@ -208,7 +208,7 @@
 class Retrieve(Processor):
     usage = u"""latest [ <count> ] articles from <name> [ starting at <number> ]
     article ( <number> | /<pattern>/ ) from <name>"""
-    feature = ('feeds',)
+    features = ('feeds',)
 
     interval = IntOption('interval', 'Feed Poll interval (in seconds)', 300)
 
 
=== modified file 'ibid/plugins/film.py'
--- ibid/plugins/film.py	2010-03-08 15:51:53 +0000
+++ ibid/plugins/film.py	2010-03-27 17:38:22 +0000
@@ -26,7 +26,7 @@
 class TVShow(Processor):
     usage = u'tvshow <show>'
 
-    feature = ('tvshow',)
+    features = ('tvshow',)
 
     def remote_tvrage(self, show):
         info_url = 'http://services.tvrage.com/tools/quickinfo.php?%s'
@@ -88,7 +88,7 @@
 }
 class IMDB(Processor):
     usage = u'imdb [search] [character|company|episode|movie|person] <terms> [#<index>]'
-    feature = ('imdb',)
+    features = ('imdb',)
 
     access_system = Option("accesssystem", "Method of querying IMDB", "http")
     adult_search = BoolOption("adultsearch", "Include adult films in search results", True)
 
=== modified file 'ibid/plugins/fun.py'
--- ibid/plugins/fun.py	2010-02-20 21:58:38 +0000
+++ ibid/plugins/fun.py	2010-03-27 17:38:22 +0000
@@ -20,7 +20,7 @@
 }
 class Nickometer(Processor):
     usage = u'nickometer [<nick>] [with reasons]'
-    feature = ('nickometer',)
+    features = ('nickometer',)
 
     @match(r'^(?:nick|lame)-?o-?meter(?:(?:\s+for)?\s+(.+?))?(\s+with\s+reasons)?$')
     def handle_nickometer(self, event, nick, wreasons):
@@ -45,7 +45,7 @@
 }
 class Choose(Processor):
     usage = u'choose <choice> or <choice>...'
-    feature = ('choose',)
+    features = ('choose',)
 
     choose_re = re.compile(r'(?:\s*,\s*(?:or\s+)?)|(?:\s+or\s+)', re.I)
 
@@ -59,7 +59,7 @@
 }
 class Coffee(Processor):
     usage = u'coffee (on|please)'
-    feature = ('coffee',)
+    features = ('coffee',)
 
     pots = {}
 
@@ -114,7 +114,7 @@
 class Insult(Processor):
     usage = u"""(flame | insult) <person>
     (swear | cuss | explete) [at <person>]"""
-    feature = ('insult',)
+    features = ('insult',)
 
     adjectives = ListOption('adjectives', 'List of adjectives', (
         u'acidic', u'antique', u'artless', u'base-court', u'bat-fowling',
 
=== modified file 'ibid/plugins/games.py'
--- ibid/plugins/games.py	2010-02-20 21:58:38 +0000
+++ ibid/plugins/games.py	2010-03-27 17:38:22 +0000
@@ -28,7 +28,7 @@
     I throw the gauntlet down at <user>'s feet [over <something>]
     """
 
-    feature = ('duel',)
+    features = ('duel',)
 
     accept_timeout = FloatOption('accept_timeout', 'How long do we wait for acceptance?', 60.0)
     start_delay = IntOption('start_delay', 'Time between acceptance and start of duel (rounded down to the highest minute)', 30)
@@ -219,7 +219,7 @@
     usage = u"""draw [my <weapon>]
     bam|pew|bang|kapow|pewpew|holyhandgrenadeofantioch"""
 
-    feature = ('duel',)
+    features = ('duel',)
 
     # Parameters for Processor:
     event_types = (u'message', u'action')
@@ -402,7 +402,7 @@
             )), duel.names[shooter], address=False)
 
 class DuelFlee(Processor):
-    feature = ('duel',)
+    features = ('duel',)
     addressed = False
     event_types = (u'state',)
 
@@ -461,7 +461,7 @@
     ( kill | see | eat ) <villager>
     vote for <villager>
     """
-    feature = ('werewolf',)
+    features = ('werewolf',)
     state = None
 
     player_limit = IntOption('min_players', 'The minimum number of players', 5)
@@ -848,7 +848,7 @@
         return self.state.__name__
 
 class WerewolfState(Processor):
-    feature = ('werewolf',)
+    features = ('werewolf',)
     event_types = (u'state',)
 
     @handler
 
=== modified file 'ibid/plugins/gameservers.py'
--- ibid/plugins/gameservers.py	2010-03-19 12:24:38 +0000
+++ ibid/plugins/gameservers.py	2010-03-27 17:38:22 +0000
@@ -16,7 +16,7 @@
 
 class Bnet(Processor):
     usage = u'dota players | who is playing dota'
-    feature = ('gameservers',)
+    features = ('gameservers',)
     autoload = False
 
     bnet_host = Option('bnet_host', 'Bnet server hostname / IP', '127.0.0.1')
@@ -54,7 +54,7 @@
 
 class CounterStrike(Processor):
     usage = u'cs players | who is playing cs'
-    feature = ('gameservers',)
+    features = ('gameservers',)
     autoload = False
 
     cs_host = Option('cs_host', 'CS server hostname / IP', '127.0.0.1')
 
=== modified file 'ibid/plugins/geography.py'
--- ibid/plugins/geography.py	2010-03-22 10:15:49 +0000
+++ ibid/plugins/geography.py	2010-03-27 17:38:22 +0000
@@ -37,7 +37,7 @@
     # http://www.mathforum.com/library/drmath/view/51711.html
     # http://mathworld.wolfram.com/GreatCircle.html
 
-    feature = ('distance',)
+    features = ('distance',)
 
     default_unit_names = {
             'km': "kilometres",
@@ -118,7 +118,7 @@
     usage = u"""weather in <city>
     forecast for <city>"""
 
-    feature = ('weather',)
+    features = ('weather',)
 
     defaults = {    'ct': 'Cape Town, South Africa',
                     'jhb': 'Johannesburg, South Africa',
@@ -236,7 +236,7 @@
 class TimeZone(Processor):
     usage = u"""when is <time> <place|timezone> in <place|timezone>
     time in <place|timezone>"""
-    feature = ('timezone',)
+    features = ('timezone',)
 
     zoneinfo = Option('zoneinfo', 'Timezone info directory', '/usr/share/zoneinfo')
     custom_zones = DictOption('timezones', 'Custom timezone names', CUSTOM_ZONES)
@@ -402,7 +402,7 @@
     usage = u"""airport [in] <name|location|code>
     [<cheapest|quickest>] flight from <departure> to <destination> from <depart_date> [anytime|morning|afternoon|evening|<time>] to <return_date> [anytime|morning|afternoon|evening|<time>]"""
 
-    feature = ('flight',)
+    features = ('flight',)
 
     airports_url = u'http://openflights.svn.sourceforge.net/viewvc/openflights/openflights/data/airports.dat'
     max_results = IntOption('max_results', 'Maximum number of results to list', 5)
 
=== modified file 'ibid/plugins/google.py'
--- ibid/plugins/google.py	2010-03-06 18:18:29 +0000
+++ ibid/plugins/google.py	2010-03-27 17:38:22 +0000
@@ -23,7 +23,7 @@
     usage = u"""google[.<tld>] [for] <term>
     googlefight [for] <term> and <term>"""
 
-    feature = ('google',)
+    features = ('google',)
 
     api_key = Option('api_key', 'Your Google API Key (optional)', None)
     referer = Option('referer', 'The referer string to use (API searches)', default_referer)
@@ -89,7 +89,7 @@
     usage = u"""gcalc <expression>
     gdefine <term>"""
 
-    feature = ('google',)
+    features = ('google',)
 
     user_agent = Option('user_agent', 'HTTP user agent to present to Google (for non-API searches)', default_user_agent)
     google_scrape_url = "http://www.google.com/search?q=%s"
 
=== modified file 'ibid/plugins/help.py'
--- ibid/plugins/help.py	2010-03-05 15:10:37 +0000
+++ ibid/plugins/help.py	2010-03-27 17:38:22 +0000
@@ -31,7 +31,7 @@
     how do I use <feature>
     help <(category|feature)>
     """
-    feature = ('help',)
+    features = ('help',)
     stemmer = Stemmer('english')
 
     def _get_features(self):
@@ -50,7 +50,7 @@
         features = {}
         processor_modules = set()
         for processor in ibid.processors:
-            for feature in getattr(processor, 'feature', []):
+            for feature in getattr(processor, 'features', []):
                 if feature not in features:
                     features[feature] = {
                             'name': feature,
 
=== modified file 'ibid/plugins/icecast.py'
--- ibid/plugins/icecast.py	2010-02-20 21:58:38 +0000
+++ ibid/plugins/icecast.py	2010-03-27 17:38:22 +0000
@@ -17,7 +17,7 @@
 }}
 class ICECast(Processor):
     usage = u"what's playing [on <stream>]?"
-    feature = ('icecast',)
+    features = ('icecast',)
 
     interval = IntOption('interval',
             'Interval between checking for song changes', 60)
 
=== modified file 'ibid/plugins/identity.py'
--- ibid/plugins/identity.py	2010-02-20 21:58:38 +0000
+++ ibid/plugins/identity.py	2010-03-27 17:38:22 +0000
@@ -29,7 +29,7 @@
     usage = u"""create account [<name>]
     delete (my account|account <name>)
     rename (my account|account <name>) to <name>"""
-    feature = ('accounts',)
+    features = ('accounts',)
 
     @match(r'^create\s+account(?:\s+(.+))?$')
     def new_account(self, event, username):
@@ -146,7 +146,7 @@
 class Identities(Processor):
     usage = u"""(I am|<username> is) <identity> on <source>
     remove identity <identity> on <source> [from <username>]"""
-    feature = ('accounts',)
+    features = ('accounts',)
     priority = -10
 
     def __init__(self, name):
@@ -319,7 +319,7 @@
 
 class Attributes(Processor):
     usage = u'set (my|<account>) <name> to <value>'
-    feature = ('accounts',)
+    features = ('accounts',)
 
     @match(r"^set\s+(my|.+?)(?:\'s)?\s+(.+)\s+to\s+(.+)$")
     def attribute(self, event, username, name, value):
@@ -353,7 +353,7 @@
 
 class Describe(Processor):
     usage = u'who (am I|is <username>)'
-    feature = ('accounts',)
+    features = ('accounts',)
 
     @match(r'^who\s+(?:is|am)\s+(I|.+?)$')
     def describe(self, event, username):
@@ -384,7 +384,7 @@
 }
 class Summon(Processor):
     usage = u'summon <person> [via <source>]'
-    feature = ('summon',)
+    features = ('summon',)
     permission = u'summon'
 
     default_source = Option('default_source',
@@ -509,7 +509,7 @@
 }
 class AddAuth(Processor):
     usage = u'authenticate <account> [on source] using <method> [<credential>]'
-    feature = ('auth',)
+    features = ('auth',)
 
     @match(r'^authenticate\s+(.+?)(?:\s+on\s+(.+))?\s+using\s+(\S+)\s+(.+)$')
     def handler(self, event, user, source, method, credential):
@@ -557,7 +557,7 @@
     usage = u"""(grant|revoke|remove) <permission> (to|from|on) <username> [when authed]
     permissions [for <username>]
     list permissions"""
-    feature = ('auth',)
+    features = ('auth',)
 
     permission = u'admin'
 
@@ -643,7 +643,7 @@
 
 class Auth(Processor):
     usage = u'auth <credential>'
-    feature = ('auth',)
+    features = ('auth',)
 
     @match(r'^auth(?:\s+(.+))?$')
     def handler(self, event, password):
 
=== modified file 'ibid/plugins/karma.py'
--- ibid/plugins/karma.py	2010-02-20 21:58:38 +0000
+++ ibid/plugins/karma.py	2010-03-27 17:38:22 +0000
@@ -51,7 +51,7 @@
 
 class Set(Processor):
     usage = u'<subject> (++|--|==|ftw|ftl) [[reason]]'
-    feature = ('karma',)
+    features = ('karma',)
 
     # Clashes with morse & math
     priority = 510
@@ -126,7 +126,7 @@
 class Get(Processor):
     usage = u"""karma for <subject>
     [reverse] karmaladder"""
-    feature = ('karma',)
+    features = ('karma',)
 
     @match(r'^karma\s+(?:for\s+)?(.+)$')
     def handle_karma(self, event, subject):
@@ -153,7 +153,7 @@
 
 class Forget(Processor):
     usage = u'forget karma for <subject> [[reason]]'
-    feature = ('karma',)
+    features = ('karma',)
 
     # Clashes with factoid
     priority = -10
 
=== modified file 'ibid/plugins/languages.py'
--- ibid/plugins/languages.py	2010-03-02 19:41:09 +0000
+++ ibid/plugins/languages.py	2010-03-27 17:38:22 +0000
@@ -24,7 +24,7 @@
     define <word> [using <dictionary>]
     (dictionaries|strategies)
     (dictionary|strategy) <name>"""
-    feature = ('dict',)
+    features = ('dict',)
 
     server = Option('server', 'Dictionary server hostname', 'localhost')
     port = IntOption('port', 'Dictionary server port number', 2628)
@@ -141,7 +141,7 @@
     usage = u"""translate (<phrase>|<url>) [from <language>] [to <language>]
     translation chain <phrase> [from <language>] [to <language>]"""
 
-    feature = ('translate',)
+    features = ('translate',)
 
     api_key = Option('api_key', 'Your Google API Key (optional)', None)
     referer = Option('referer', 'The referer string to use (API searches)', default_referer)
 
=== modified file 'ibid/plugins/lotto.py'
--- ibid/plugins/lotto.py	2010-02-21 09:45:01 +0000
+++ ibid/plugins/lotto.py	2010-03-27 17:38:22 +0000
@@ -17,7 +17,7 @@
 class Lotto(Processor):
     usage = u'lotto'
 
-    feature = ('lotto',)
+    features = ('lotto',)
 
     za_url = 'http://www.nationallottery.co.za/'
     za_re = re.compile(r'images/(?:power_)?balls/(?:ball|power)_(\d+).gif')
 
=== modified file 'ibid/plugins/meetings.py'
--- ibid/plugins/meetings.py	2010-02-20 21:58:38 +0000
+++ ibid/plugins/meetings.py	2010-03-27 17:38:22 +0000
@@ -37,7 +37,7 @@
     minutes so far
     meeting title is <title>
     """
-    feature = ('meeting',)
+    features = ('meeting',)
     permission = u'chairmeeting'
 
     formats = Option('formats', u'Formats to log to. '
@@ -244,7 +244,7 @@
     addressed = False
     processed = True
     priority = 1900
-    feature = ('meeting',)
+    features = ('meeting',)
 
     def process(self, event):
         if 'channel' in event and 'source' in event \
@@ -283,7 +283,7 @@
     vote (<id> | <option>) [on <topic>]
     end poll
     """
-    feature = ('poll',)
+    features = ('poll',)
     permission = u'chairmeeting'
 
     polls = {}
 
=== modified file 'ibid/plugins/memo.py'
--- ibid/plugins/memo.py	2010-02-20 21:58:38 +0000
+++ ibid/plugins/memo.py	2010-03-27 17:38:22 +0000
@@ -65,7 +65,7 @@
 class Tell(Processor):
     usage = u"""(tell|pm|privmsg|msg|ask) <person> [on <source>] <message>
     forget my (first|last|<n>th) message for <person> [on <source>]"""
-    feature = ('memo',)
+    features = ('memo',)
 
     permission = u'sendmemo'
     permissions = (u'recvmemo',)
@@ -228,7 +228,7 @@
             .order_by(Memo.time.asc()).all()
 
 class Deliver(Processor):
-    feature = ('memo',)
+    features = ('memo',)
 
     addressed = False
     processed = True
@@ -289,7 +289,7 @@
             nomemos_cache.add(event.identity)
 
 class Notify(Processor):
-    feature = ('memo',)
+    features = ('memo',)
 
     event_types = (u'state',)
     addressed = False
@@ -325,7 +325,7 @@
     usage = u"""my messages
     message <number>
     my messages for <person> [on <source>]"""
-    feature = ('memo',)
+    features = ('memo',)
 
     @match(r'^my\s+messages$')
     def messages(self, event):
 
=== modified file 'ibid/plugins/memory.py'
--- ibid/plugins/memory.py	2010-02-21 09:45:01 +0000
+++ ibid/plugins/memory.py	2010-03-27 17:38:22 +0000
@@ -26,7 +26,7 @@
 
 class MemoryLog(Processor):
 
-    feature = ('memory',)
+    features = ('memory',)
     autoload = False
 
     mem_filename = Option('mem_filename', 'Memory log filename', 'logs/memory.log')
@@ -99,7 +99,7 @@
 class MemoryInfo(Processor):
     usage = u'memory usage'
 
-    feature = ('memory',)
+    features = ('memory',)
 
     @match('^memory\s+usage$')
     def memory_usage(self, event):
 
=== modified file 'ibid/plugins/network.py'
--- ibid/plugins/network.py	2010-03-07 10:08:03 +0000
+++ ibid/plugins/network.py	2010-03-27 17:38:22 +0000
@@ -33,7 +33,7 @@
 class DNS(Processor):
     usage = u'dns [<record type>] [for] <host> [from <nameserver>]'
 
-    feature = ('dns',)
+    features = ('dns',)
 
     def setup(self):
         if Resolver is None:
@@ -82,7 +82,7 @@
 }
 class Ping(Processor):
     usage = u'ping <host>'
-    feature = ('ping',)
+    features = ('ping',)
 
     ping = Option('ping', 'Path to ping executable', 'ping')
 
@@ -115,7 +115,7 @@
 }
 class Tracepath(Processor):
     usage = u'tracepath <host>'
-    feature = ('tracepath',)
+    features = ('tracepath',)
 
     tracepath = Option('tracepath', 'Path to tracepath executable', 'tracepath')
 
@@ -144,7 +144,7 @@
 class IPCalc(Processor):
     usage = u"""ipcalc <network>/<subnet>
     ipcalc <address> - <address>"""
-    feature = ('ipcalc',)
+    features = ('ipcalc',)
 
     ipcalc = Option('ipcalc', 'Path to ipcalc executable', 'ipcalc')
 
@@ -221,7 +221,7 @@
     usage = u"""(get|head) <url>
     is <domain> (up|down)
     tell me when <domain|url> is up"""
-    feature = ('http',)
+    features = ('http',)
     priority = -10
 
     max_size = IntOption('max_size', u'Only request this many bytes', 500)
@@ -417,7 +417,7 @@
 class TLD(Processor):
     usage = u""".<tld>
     tld for <country>"""
-    feature = ('tld',)
+    features = ('tld',)
 
     country_codes = {}
 
@@ -461,7 +461,7 @@
 class Ports(Processor):
     usage = u"""port for <protocol>
     (tcp|udp) port <number>"""
-    feature = ('ports',)
+    features = ('ports',)
     priority = 10
 
     services = Option('services', 'Path to services file', '/etc/services')
@@ -534,7 +534,7 @@
     usage = u"""port scan <hostname>
     net scan <network>/<prefix>"""
 
-    feature = ('nmap',)
+    features = ('nmap',)
     permission = 'nmap'
     min_prefix = IntOption('min_prefix', 'Minimum network prefix that may be scanned', 24)
 
 
=== modified file 'ibid/plugins/oeis.py'
--- ibid/plugins/oeis.py	2010-02-20 21:58:38 +0000
+++ ibid/plugins/oeis.py	2010-03-27 17:38:22 +0000
@@ -19,7 +19,7 @@
     usage = u"""oeis (A<OEIS number>|M<EIS number>|N<HIS number>)
     oeis <term>[, ...]"""
 
-    feature = ('oeis',)
+    features = ('oeis',)
 
     @match(r'^oeis\s+([AMN]\d+|-?\d(?:\d|-|,|\s)*)$')
     def oeis (self, event, query):
 
=== modified file 'ibid/plugins/quotes.py'
--- ibid/plugins/quotes.py	2010-03-27 14:18:33 +0000
+++ ibid/plugins/quotes.py	2010-03-27 17:38:22 +0000
@@ -27,7 +27,7 @@
 }
 class Fortune(Processor, RPC):
     usage = u'fortune'
-    feature = ('fortune',)
+    features = ('fortune',)
 
     fortune = Option('fortune', 'Path of the fortune executable', 'fortune')
 
@@ -66,7 +66,7 @@
 class Bash(Processor):
     usage = u'bash[.org] [(random|<number>)]'
 
-    feature = ('bash',)
+    features = ('bash',)
 
     public_browse = BoolOption('public_browse', 'Allow random quotes in public', True)
 
@@ -103,7 +103,7 @@
 class FMyLife(Processor):
     usage = u'fml (<number> | [random] | flop | top | last | love | money | kids | work | health | sex | miscellaneous )'
 
-    feature = ('fml',)
+    features = ('fml',)
 
     api_url = Option('fml_api_url', 'FML API URL base', 'http://api.betacie.com/')
     # The Ibid API Key, registered by Stefano Rivera:
@@ -173,7 +173,7 @@
     usage = u"""tfln [(random|<number>)]
     tfln (worst|best) [(today|this week|this month)]"""
 
-    feature = ('tfln',)
+    features = ('tfln',)
 
     public_browse = BoolOption('public_browse', 'Allow random quotes in public', True)
 
@@ -252,7 +252,7 @@
     usage = u"""mlia [(<number> | random | recent | today | yesterday | this week | this month | this year )]
     mlig [(<number> | random | recent | today | yesterday | this week | this month | this year )]"""
 
-    feature = ('mlia',)
+    features = ('mlia',)
 
     public_browse = BoolOption('public_browse',
                                'Allow random quotes in public', True)
@@ -367,7 +367,7 @@
     usage = u"""bible <passages> [in <version>]
     <book> <verses> [in <version>]"""
 
-    feature = ('bible',)
+    features = ('bible',)
     # http://labs.bible.org/api/ is an alternative
     # Their feature set is a little different, but they should be fairly
     # compatible
 
=== modified file 'ibid/plugins/rfc.py'
--- ibid/plugins/rfc.py	2010-02-20 21:58:38 +0000
+++ ibid/plugins/rfc.py	2010-03-27 17:38:22 +0000
@@ -21,7 +21,7 @@
     usage = u"""rfc <number>
     rfc [for] <search terms>
     rfc [for] /regex/"""
-    feature = ('rfc',)
+    features = ('rfc',)
 
     indexurl = Option('index_url', "A HTTP url for the RFC Index file", "http://www.rfc-editor.org/rfc/rfc-index.txt")
     cachetime = IntOption("cachetime", "Time to cache RFC index for", cachetime)
 
=== modified file 'ibid/plugins/seen.py'
--- ibid/plugins/seen.py	2010-02-20 21:58:38 +0000
+++ ibid/plugins/seen.py	2010-03-27 17:38:22 +0000
@@ -63,7 +63,7 @@
                self.type, self.identity_id, self.channel, self.time, self.value)
 
 class See(Processor):
-    feature = ('seen',)
+    features = ('seen',)
 
     priority = 1500
     event_types = (u'message', u'state')
@@ -98,7 +98,7 @@
 
 class Seen(Processor):
     usage = u'seen <who>'
-    feature = ('seen',)
+    features = ('seen',)
 
     @match(r'^(?:have\s+you\s+)?seen\s+(\S+)(?:\s+on\s+(\S+))?$')
     def handler(self, event, who, source):
 
=== modified file 'ibid/plugins/social.py'
--- ibid/plugins/social.py	2010-03-01 15:13:45 +0000
+++ ibid/plugins/social.py	2010-03-27 17:38:22 +0000
@@ -24,7 +24,7 @@
 class LastFm(Processor):
     usage = u'last.fm for <username>'
 
-    feature = ('lastfm',)
+    features = ('lastfm',)
 
     @match(r'^last\.?fm\s+for\s+(\S+?)\s*$')
     def listsongs(self, event, username):
@@ -46,7 +46,7 @@
     usage = u"""latest (tweet|identica) from <name>
     (tweet|identica) <number>"""
 
-    feature = ('microblog',)
+    features = ('microblog',)
 
     default = {
         'twitter':   {'endpoint': 'http://twitter.com/',   'api': 'twitter',  'name': 'tweet', 'user': 'twit'},
 
=== modified file 'ibid/plugins/sources.py'
--- ibid/plugins/sources.py	2010-03-14 10:27:08 +0000
+++ ibid/plugins/sources.py	2010-03-27 17:38:22 +0000
@@ -22,7 +22,7 @@
 class Actions(Processor):
     usage = u"""(join|part|leave) [<channel> [on <source>]]
     change nick to <nick> [on <source>]"""
-    feature = ('actions',)
+    features = ('actions',)
 
     permission = 'sources'
 
@@ -75,7 +75,7 @@
             event.addresponse(u'Changing nick to %s', nick)
 
 class Invited(Processor):
-    feature = ('actions',)
+    features = ('actions',)
 
     event_types = ('invite',)
     permission = 'sources'
@@ -120,7 +120,7 @@
 }
 class SayDo(Processor):
     usage = u'(say|do) in <channel> [on <source>] <text>'
-    feature = ('saydo',)
+    features = ('saydo',)
 
     permission = u'saydo'
 
@@ -137,7 +137,7 @@
 }
 class RedirectCommand(Processor):
     usage = u'redirect [to] <channel> [on <source>] <command>'
-    feature = ('redirect',)
+    features = ('redirect',)
 
     priority = -1200
     permission = u'saydo'
@@ -154,7 +154,7 @@
         event.message['clean'] = command
 
 class Redirect(Processor):
-    feature = ('redirect',)
+    features = ('redirect',)
 
     processed = True
     priority = 940
 
=== modified file 'ibid/plugins/strings.py'
--- ibid/plugins/strings.py	2010-03-01 15:13:45 +0000
+++ ibid/plugins/strings.py	2010-03-27 17:38:22 +0000
@@ -18,7 +18,7 @@
 class Hash(Processor):
     usage = u"""(md5|sha1|sha224|sha256|sha384|sha512) <string>
     crypt <string> <salt>"""
-    feature = ('hash',)
+    features = ('hash',)
 
     @match(r'^(md5|sha1|sha224|sha256|sha384|sha512)(?:sum)?\s+(.+?)$')
     def hash(self, event, hash, string):
@@ -35,7 +35,7 @@
 }
 class Base64(Processor):
     usage = u'base(16|32|64) (encode|decode) <string>'
-    feature = ('base64',)
+    features = ('base64',)
 
     @match(r'^b(?:ase)?(16|32|64)\s*(enc|dec)(?:ode)?\s+(.+?)$')
     def base64(self, event, base, operation, string):
@@ -59,7 +59,7 @@
 }
 class Rot13(Processor):
     usage = u'rot13 <string>'
-    feature = ('rot13',)
+    features = ('rot13',)
 
     @match(r'^rot13\s+(.+)$')
     def rot13(self, event, string):
@@ -72,7 +72,7 @@
 }
 class Dvorak(Processor):
     usage = u"""(aoeu|asdf) <text>"""
-    feature = ('dvorak',)
+    features = ('dvorak',)
 
     # List of characters on each keyboard layout
     dvormap = u"""',.pyfgcrl/=aoeuidhtns-;qjkxbmwvz"<>PYFGCRL?+AOEUIDHTNS_:QJKXBMWVZ[]{}|"""
@@ -98,7 +98,7 @@
 }
 class ReTest(Processor):
     usage = u'does <pattern> match <string>'
-    feature = ('retest',)
+    features = ('retest',)
     permission = 'regex'
 
     @match('^does\s+(.+?)\s+match\s+(.+?)$')
@@ -112,7 +112,7 @@
 }
 class Morse(Processor):
     usage = u'morse (text|morsecode)'
-    feature = ('morse',)
+    features = ('morse',)
 
     _table = {
         'A': ".-",
 
=== modified file 'ibid/plugins/svn.py'
--- ibid/plugins/svn.py	2010-02-21 09:45:01 +0000
+++ ibid/plugins/svn.py	2010-03-27 17:38:22 +0000
@@ -393,7 +393,7 @@
     usage = u"""(last commit|commit <revno>) [to <repo>] [full]
     (svnrepos|svnrepositories)
     """
-    feature = ('svn',)
+    features = ('svn',)
     autoload = False
 
     permission = u'svn'
 
=== modified file 'ibid/plugins/sysadmin.py'
--- ibid/plugins/sysadmin.py	2010-03-07 18:32:23 +0000
+++ ibid/plugins/sysadmin.py	2010-03-27 17:38:22 +0000
@@ -17,7 +17,7 @@
 }
 class Aptitude(Processor):
     usage = u'apt (search|show) <term>'
-    feature = ('aptitude',)
+    features = ('aptitude',)
 
     aptitude = Option('aptitude', 'Path to aptitude executable', 'aptitude')
 
@@ -120,7 +120,7 @@
 }
 class AptFile(Processor):
     usage = u'apt-file [search] <term>'
-    feature = ('apt-file',)
+    features = ('apt-file',)
 
     aptfile = Option('apt-file', 'Path to apt-file executable', 'apt-file')
 
@@ -159,7 +159,7 @@
 }
 class Man(Processor):
     usage = u'man [<section>] <page>'
-    feature = ('man',)
+    features = ('man',)
 
     man = Option('man', 'Path of the man executable', 'man')
 
@@ -202,7 +202,7 @@
 }
 class Mac(Processor):
     usage = u'mac <address>'
-    feature = ('mac',)
+    features = ('mac',)
 
     @match(r'^((?:mac|oui|ether(?:net)?(?:\s*code)?)\s+)?((?:(?:[0-9a-f]{2}(?(1)[:-]?|:))){2,5}[0-9a-f]{2})$')
     def lookup_mac(self, event, _, mac):
 
=== modified file 'ibid/plugins/test.py'
--- ibid/plugins/test.py	2010-02-20 21:58:38 +0000
+++ ibid/plugins/test.py	2010-03-27 17:38:22 +0000
@@ -18,7 +18,7 @@
     raise exception
     topic <topic>
     """
-    feature = ('test',)
+    features = ('test',)
     permission = u'debug'
 
     @match(r'^delay\s+(\d+\.?\d*)$')
 
=== modified file 'ibid/plugins/trac.py'
--- ibid/plugins/trac.py	2010-02-20 21:58:38 +0000
+++ ibid/plugins/trac.py	2010-03-27 17:38:22 +0000
@@ -30,7 +30,7 @@
 class Tickets(Processor, RPC):
     usage = u"""ticket <number>
     (open|my|<who>'s) tickets"""
-    feature = ('trac',)
+    features = ('trac',)
     autoload = 'trac' in ibid.databases
 
     url = Option('url', 'URL of Trac instance')
 
=== modified file 'ibid/plugins/urlinfo.py'
--- ibid/plugins/urlinfo.py	2010-02-20 21:58:38 +0000
+++ ibid/plugins/urlinfo.py	2010-03-27 17:38:22 +0000
@@ -26,7 +26,7 @@
 }
 class Shorten(Processor):
     usage = u'shorten <url>'
-    feature = ('tinyurl',)
+    features = ('tinyurl',)
 
     @match(r'^shorten\s+(\S+\.\S+)$')
     def shorten(self, event, url):
@@ -44,7 +44,7 @@
 class Lengthen(Processor):
     usage = u"""<url>
     expand <url>"""
-    feature = ('tinyurl',)
+    features = ('tinyurl',)
 
     services = ListOption('services', 'List of URL prefixes of URL shortening services', (
         'http://is.gd/', 'http://tinyurl.com/', 'http://ff.im/',
@@ -81,7 +81,7 @@
 class Youtube(Processor):
     usage = u'<Youtube URL>'
 
-    feature = ('youtube',)
+    features = ('youtube',)
 
     @match(r'^(?:youtube(?:\.com)?\s+)?'
         r'(?:http://)?(?:\w+\.)?youtube\.com/'