Merge lp:~isoschiz/endroid/cmd-and-help-changes into lp:endroid

[Martin Morrison]

Merge changes in to handle actually building successful packages on both lucid and later distros (along with misc other fixes).

[Martin Morrison (isoschiz)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-08-31 19:21:34 +0000
+++ debian/changelog	2012-09-02 21:51:19 +0000
@@ -1,3 +1,10 @@
+endroid (1.1.1) lucid; urgency=low
+
+  * Improved build system (to support multiple Python versions)
+  * Improvements to plugin APIs - especially for command-based plugins, and help
+
+ -- Martin Morrison <[e-mail]>  Fri, 02 Sep 2012 22:00:00 +0100
+
 endroid (1.1) lucid; urgency=low
 
   * Enhanced Help system

=== modified file 'debian/control' (properties changed: +x to -x)
--- debian/control	2012-08-13 22:27:22 +0000
+++ debian/control	2012-09-02 21:51:19 +0000
@@ -2,7 +2,7 @@
 Maintainer: Jonathan Millican <[e-mail]>
 Section: misc
 Priority: optional
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7), python
 Standards-Version: 3.8.4
 
 Package: endroid

=== modified file 'debian/endroid.install'
--- debian/endroid.install	2012-08-13 22:27:22 +0000
+++ debian/endroid.install	2012-09-02 21:51:19 +0000
@@ -1,21 +1,4 @@
 etc/endroid.conf etc/endroid/
 etc/init/endroid.conf etc/init/
 bin/endroid usr/bin/
-src/endroid/__init__.py usr/lib/pymodules/python2.6/endroid
-src/endroid/config.py usr/lib/pymodules/python2.6/endroid
-src/endroid/cron.py usr/lib/pymodules/python2.6/endroid
-src/endroid/database.py usr/lib/pymodules/python2.6/endroid
-src/endroid/messagehandler.py usr/lib/pymodules/python2.6/endroid
-src/endroid/pluginmanager.py usr/lib/pymodules/python2.6/endroid
-src/endroid/rosterhandler.py usr/lib/pymodules/python2.6/endroid
-src/endroid/usermanagement.py usr/lib/pymodules/python2.6/endroid
-src/endroid/wokkelhandler.py usr/lib/pymodules/python2.6/endroid
-src/endroid/plugins/__init__.py usr/lib/pymodules/python2.6/endroid/plugins
-src/endroid/plugins/command.py usr/lib/pymodules/python2.6/endroid/plugins
-src/endroid/plugins/echobot.py usr/lib/pymodules/python2.6/endroid/plugins
-src/endroid/plugins/help.py usr/lib/pymodules/python2.6/endroid/plugins
-src/endroid/plugins/patternmatcher.py usr/lib/pymodules/python2.6/endroid/plugins
-src/endroid/plugins/speak.py usr/lib/pymodules/python2.6/endroid/plugins
-src/endroid/plugins/unhandled.py usr/lib/pymodules/python2.6/endroid/plugins
-src/endroid/plugins/whosonline.py usr/lib/pymodules/python2.6/endroid/plugins
 lib/wokkel-0.7.0-py2.7.egg usr/lib/endroid/dependencies

=== modified file 'debian/rules'
--- debian/rules	2012-08-13 22:27:22 +0000
+++ debian/rules	2012-09-02 21:51:19 +0000
@@ -1,4 +1,6 @@
 #!/usr/bin/make -f
 
+WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2")
+
 %:
-	dh $@
+	dh ${WITH_PYTHON2} $@

=== modified file 'etc/endroid.conf'
--- etc/endroid.conf	2012-08-30 22:53:47 +0000
+++ etc/endroid.conf	2012-09-02 21:51:19 +0000
@@ -5,8 +5,10 @@
 
 plugins =
   endroid.plugins.blacklist
+  endroid.plugins.chuck
   endroid.plugins.command
   endroid.plugins.compute
+  endroid.plugins.coolit
   endroid.plugins.correct
   endroid.plugins.echobot
   endroid.plugins.help

=== modified file 'etc/init/endroid.conf'
--- etc/init/endroid.conf	2012-08-13 22:27:22 +0000
+++ etc/init/endroid.conf	2012-09-02 21:51:19 +0000
@@ -1,7 +1,7 @@
 description "EnDroid XMPP bot"
 author "Ensoft Limited"
 
-exec /usr/bin/endroid /etc/endroid/endroid.conf
+exec /usr/bin/endroid -L /var/log/endroid.log /etc/endroid/endroid.conf
 start on net-device-up
 stop on stopping network
 stop on starting shutdown

=== added file 'setup.py'
--- setup.py	1970-01-01 00:00:00 +0000
+++ setup.py	2012-09-02 21:51:19 +0000
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+#
+# EnDroid setup file
+#
+
+from distutils.core import setup
+
+setup(name='endroid',
+      version="1.1",
+      description='EnDroid: a modular XMPP bot',
+      url='http://open.ensoft.co.uk/EnDroid',
+      packages=['endroid', 'endroid.plugins'],
+      package_dir={'endroid': 'src/endroid'},
+     )

=== modified file 'src/endroid/__init__.py'
--- src/endroid/__init__.py	2012-09-01 23:15:55 +0000
+++ src/endroid/__init__.py	2012-09-02 21:51:19 +0000
@@ -25,6 +25,8 @@
 from endroid.pluginmanager import PluginManager
 from endroid.cron import Cron
 
+__version__ = (1, 1)
+
 class Endroid(object):
     def __init__(self, conffile, logtraffic=False):
         self.application = service.Application("EnDroid")

=== modified file 'src/endroid/cron.py'
--- src/endroid/cron.py	2012-08-08 23:58:18 +0000
+++ src/endroid/cron.py	2012-09-02 21:51:19 +0000
@@ -71,7 +71,6 @@
         
     
     def _do_crons(self):
-        print "Running Crons"
 #        curtime = datetime.now(timezone('GMT'))
         delays = self.db.fetch('cron_delay', ['timestamp', 'fun_name', 'params', 'rowid'])
         set_times = self.db.fetch('cron_datetime', ['datetime', 'fun_name', 'params', 'locality', 'rowid'])

=== modified file 'src/endroid/plugins/blacklist.py'
--- src/endroid/plugins/blacklist.py	2012-08-30 22:53:47 +0000
+++ src/endroid/plugins/blacklist.py	2012-09-02 21:51:19 +0000
@@ -9,8 +9,6 @@
 from endroid.cron import Cron
 from endroid.config import as_list
 
-import logging
-
 # DB constants
 DB_NAME = "Blacklist"
 DB_TABLE = "Blacklist"
@@ -25,10 +23,10 @@
     list is silently dropped, without allowing any handlers to be called for
     them.
     """
-    name = "blacklist"
+    help = "Maintain a blacklist of JIDs who get ignored by EnDroid."
     hidden = True
 
-    def enInit(self):
+    def endroid_init(self):
         """
         Initialise the plugin, and recover the blacklist from the DB.
         """
@@ -76,7 +74,7 @@
             if cmd == "add" and user not in self._blacklist:
                 self.blacklist(user)
             elif cmd == "remove" and user in self._blacklist:
-                self.blacklist(user)
+                self.unblacklist(user)
             elif cmd == "list":
                 msg.reply("Blacklist: " + ", ".join(self._blacklist))
             else:

=== modified file 'src/endroid/plugins/chuck.py'
--- src/endroid/plugins/chuck.py	2012-09-01 23:15:55 +0000
+++ src/endroid/plugins/chuck.py	2012-09-02 21:51:19 +0000
@@ -6,25 +6,18 @@
 import re
 from HTMLParser import HTMLParser
 from twisted.web.client import getPage
-from endroid.pluginmanager import Plugin
+from endroid.plugins.command import CommandPlugin
 
 FACTRE = re.compile(r'<div id="wia_factBox">(.*?)</p>', re.S)
 
-class Chuck(Plugin):
-    name = "chucknorris"
-    dependencies = ('endroid.plugins.command',)
+class ChuckNorris(CommandPlugin):
     help = "Get a random Chuck Norris fact."
 
-    def endroid_init(self):
-        com, = self.get_dependencies()
-        com.register_both(self.chuck, 'chuck',
-                          synonyms=('norris', 'chucknorris'))
-
-    def chuck(self, msg, arg):
-        def fact(data):
-            h = HTMLParser()
+    def cmd_chuck(self, msg, arg):
+        def extract_fact(data):
             fact = re.sub(r"<.*?>", "", FACTRE.search(data).group(1)).strip()
-            msg.reply("Fact: {0}".format(h.unescape(fact.strip())))
+            msg.reply("Fact: {0}".format(HTMLParser().unescape(fact.strip())))
 
-        getPage("http://www.whatisawesome.com/chuck").addCallbacks(fact,
+        getPage("http://www.whatisawesome.com/chuck").addCallbacks(extract_fact,
                                                                    msg.unhandled)
+    cmd_chuck.synonyms = ('norris', 'chucknorris')

=== modified file 'src/endroid/plugins/command.py'
--- src/endroid/plugins/command.py	2012-09-01 23:15:55 +0000
+++ src/endroid/plugins/command.py	2012-09-02 21:51:19 +0000
@@ -7,7 +7,11 @@
 import logging
 
 from collections import namedtuple
-from endroid.pluginmanager import Plugin
+from endroid.pluginmanager import Plugin, PluginMeta
+
+__all__ = (
+    'CommandPlugin',
+    )
 
 # A single registration
 # - callback is the registered callback function
@@ -22,6 +26,51 @@
 # - subcommands is a dict of subcommand (simple str) to Handlers object
 Handlers = namedtuple('Handlers', ('handlers', 'subcommands'))
 
+class CommandPluginMeta(PluginMeta):
+    """
+    Metaclass to support simple command-driven plugins. This should not be used
+    directly, but rather by subclassing from CommandPlugin rather than Plugin.
+    """
+    def __new__(meta, name, bases, dct):
+        cmds = dict((c, f) for c, f in dct.items() if c.startswith("cmd_"))
+        init = dct.get('endroid_init', lambda _: None)
+        def endroid_init(self):
+            com = self.get('endroid.plugins.command')
+            for cmd, fn in cmds.items():
+                if getattr(fn, "chat_only", False):
+                    reg_fn = com.register_chat
+                elif getattr(fn, "muc_only", False):
+                    reg_fn = com.register_muc
+                else:
+                    reg_fn = com.register_both
+                reg_fn(getattr(self, cmd), cmd.split("_")[1:],
+                       helphint=getattr(fn, "helphint", ""),
+                       hidden=getattr(fn, "hidden", False),
+                       synonyms=getattr(fn, "synonyms", ()))
+            init(self)
+        dct['endroid_init'] = endroid_init
+        dct['dependencies'] = tuple(dct.get('dependencies', ()) +
+                                    ('endroid.plugins.command',))
+        return PluginMeta.__new__(meta, name, bases, dct)
+
+class CommandPlugin(Plugin):
+    """
+    Parent class for simple command-driven plugins. Such plugins don't need to
+    explicitly register their commands. Instead, they can just define methods
+    prefixed with "cmd_" and they will automatically be registered. Any
+    additional underscores in the method name will be converted to spaces in
+    the registration (so cmd_foo_bar is registered as ('foo', 'bar')).
+
+    In addition, certain options can be passed by adding fields to the methods:
+    - hidden: don't show the command in help if set to True.
+    - synonyms: an iterable of alternative keyword sequences to register the
+        method against. All synonyms are hidden.
+    - helphint: a hint to print after the keywords in help output.
+    - muc_only or chat_only: register for only chat or muc messages (default is
+        both).
+    """
+    __metaclass__ = CommandPluginMeta
+
 class Command(Plugin):
     """
     Helper plugin to handle command registrations by other plugins. This is
@@ -29,13 +78,20 @@
     and it is expected most plugins will depend on this.
     """
     name = "commands"
+    hidden = True # This plugin is built in to the help module
 
-    def enInit(self):
+    def endroid_init(self):
         self._muc_handlers = Handlers([], {})
         self._chat_handlers = Handlers([], {})
         self.register_muc_callback(self.command_muc)
         self.register_chat_callback(self.command_chat)
 
+        self._topics = {
+            '': self.help_main,
+            'chat': self.help_chat,
+            'muc': self.help_muc,
+            }
+
     # -------------------------------------------------------------------------
     # Help methods
 
@@ -47,21 +103,42 @@
         """
         for reg in handlers.handlers:
             if not reg.hidden:
-                output.append("%s %s" % (reg.command, reg.helphint))
+                output.append("  %s %s" % (reg.command, reg.helphint))
         for _, hdlrs in sorted(handlers.subcommands.items()):
             self.help_add_regs(output, hdlrs)
 
-    def help(self):
-        out = ["Command Module Help:", ""]
+    def help(self, topic):
+        topics = topic.strip().split(' ', 1)
+        topic, extra = topics[0], "".join(topics[1:])
+        if topic in self._topics:
+            return self._topics[topic](extra)
+
+    def help_main(self, topic):
+        assert not topic
+        out = ["Commands known to me:"]
+        chat = self.help_chat(topic)
+        if chat:
+            out.extend(["", chat])
+        muc = self.help_muc(topic)
+        if muc:
+            out.extend(["", muc])
+        return "\n".join(out)
+
+    def help_chat(self, topic):
         parts = []
         self.help_add_regs(parts, self._chat_handlers)
         if parts:
-            out.extend(["\nCommands in Chat:"] + parts)
+            return "\n".join(["Commands in Chat:"] + parts)
+        else:
+            return "No command registered in chat."
+
+    def help_muc(self, topic):
         parts = []
         self.help_add_regs(parts, self._muc_handlers)
         if parts:
-            out.extend(["\nCommands in MUC:"] + parts)
-        return "\n".join(out)
+            return "\n".join(["Commands in MUC:"] + parts)
+        else:
+            return "No commands registed in MUC."
 
     # -------------------------------------------------------------------------
     # Command handling methods
@@ -139,4 +216,3 @@
         """Register a handler for both MUC and chat messages."""
         self.register_muc(callback, command, helphint, hidden, synonyms)
         self.register_chat(callback, command, helphint, hidden, synonyms)
-

=== added file 'src/endroid/plugins/coolit.py'
--- src/endroid/plugins/coolit.py	1970-01-01 00:00:00 +0000
+++ src/endroid/plugins/coolit.py	2012-09-02 21:51:19 +0000
@@ -0,0 +1,15 @@
+# -----------------------------------------------------------------------------
+# EnDroid - Cool it Plugin
+# Copyright 2012, Ensoft Ltd
+# -----------------------------------------------------------------------------
+
+from endroid.plugins.command import CommandPlugin
+
+class CoolIt(CommandPlugin):
+    help = "I'm a robot. I'm not a refrigerator."
+    hidden = True
+    
+    def cmd_coolit(self, msg, args):
+        msg.reply(self.help)
+    cmd_coolit.hidden = True
+    cmd_coolit.synonyms = ('cool it',)

=== modified file 'src/endroid/plugins/correct.py'
--- src/endroid/plugins/correct.py	2012-08-13 17:25:40 +0000
+++ src/endroid/plugins/correct.py	2012-09-02 21:51:19 +0000
@@ -17,15 +17,13 @@
     last message heard from the sender using that regex.
     """
     name = "correct"
+    help = "Correct typos using s/<regex>/<replace>/[gi]"
 
-    def enInit(self):
+    def endroid_init(self):
         self.lastmsg = {}
         self.register_chat_callback(self.heard)
         self.register_muc_callback(self.heard)
 
-    def help(self):
-        return "Correct typos using s/<regex>/<replace>/[gi]"
-
     def heard(self, msg):
         """
         Monitors all received messages to track the last message from each
@@ -46,8 +44,8 @@
         matches in the match object (given in 'match'). Replies are sent via
         the given 'msg' (so either to the room or original sender).
 
-        The regular expression support full Python regex syntax; the
-        replacement group support backreferences using \1 or \g<1> syntax; two
+        The regular expressions support full Python regex syntax; the
+        replacement group supports backreferences using \1 or \g<1> syntax; two
         flags are supported: i for case-insensitive, and g for global
         replacements.
         """

=== modified file 'src/endroid/plugins/echobot.py'
--- src/endroid/plugins/echobot.py	2012-08-02 12:34:17 +0000
+++ src/endroid/plugins/echobot.py	2012-09-02 21:51:19 +0000
@@ -7,14 +7,9 @@
 from endroid.pluginmanager import Plugin
 
 class EchoBot(Plugin):
-    name = "echo"
-    
-    def enInit(self):
+    def endroid_plugin(self):
         self.register_chat_callback(self.do_echo)
         self.register_muc_callback(self.do_echo)
     
     def do_echo(self, msg):
         msg.reply(msg.body)
-
-def get_plugin():
-    return EchoBot()

=== modified file 'src/endroid/plugins/help.py'
--- src/endroid/plugins/help.py	2012-09-01 23:15:55 +0000
+++ src/endroid/plugins/help.py	2012-09-02 21:51:19 +0000
@@ -7,14 +7,19 @@
 
 class Help(Plugin):
     name = "help"
-    
-    def dependencies(self):
-        return ('endroid.plugins.command',)
-    
-    def enInit(self):
-        com = self.get('endroid.plugins.command')
+    dependencies = ('endroid.plugins.command',)
+    help = "DON'T PANIC!"
+    
+    def endroid_init(self):
+        com, = self.get_dependencies()
         com.register_both(self.show_help, 'help')
 
+        self._topics = {
+            '': self.show_help_main,
+            'plugins': self.show_help_plugins,
+            'commands': self.show_help_commands,
+            }
+
         self.load_plugin_list()
 
     def load_plugin_list(self):
@@ -23,39 +28,58 @@
             plugin = self.get(fullname)
             name = getattr(plugin, "name", fullname)
             self.plugins[name] = (fullname, plugin)
-    
+
     def show_help(self, msg, args):
+        topics = args.split(' ', 1)
+        if topics[0] in self._topics:
+            self._topics[topics[0]](msg, "".join(topics[1:]))
+        else:
+            name, topic = topics[0], "".join(topics[1:])
+            self.show_help_plugin(msg, name, topic)
+
+    def show_help_main(self, msg, topic):
+        assert not topic
         out = []
-        if not args.strip():
-            out.append("Help Module. Plugins Loaded:")
+        out.append("EnDroid at your service! Help topics:")
+        out.append("  plugins - list loaded plugins")
+        out.append("  commands - list supported commands")
+        out.append("  <pluginname> - help provided by the given plugin")
+        msg.reply_to_sender("\n".join(out))
+
+    def show_help_plugins(self, msg, topic):
+        if topic.strip():
+            # specific plugin?
+            topics = topic.split(" ", 1)
+            name, topic = topics[0], "".join(topics[1:])
+            self.show_help_plugin(msg, name, topic)
+        else:
+            out = []
+            out.append("Currently loaded plugins:")
             for name, (_, plug) in sorted(self.plugins.items()):
                 if not getattr(plug, "hidden", False):
-                    out.append(name)
+                    out.append("  {0}".format(name))
+            msg.reply_to_sender("\n".join(out))
+
+    def show_help_commands(self, msg, topic):
+        self.show_help_plugin(msg, "commands", topic)
+
+    def show_help_plugin(self, msg, name, topic):
+        out = []
+        fullname, plugin = self.plugins.get(name, (name, None))
+        if self.pluginLoaded(fullname):
+            if plugin.hasattr("help"):
+                try:
+                    out.append(plugin.help(topic))
+                except TypeError:
+                    if topic:
+                        out.append("(Plugin doesn't support topic help)")
+                    if callable(plugin.help):
+                        out.append(plugin.help())
+                    else:
+                        out.append(str(plugin.help))
+            else:
+                out.append("Plugin {0} has no help provided".format(name))
         else:
-            splitsies = args.split(' ', 1)
-            if len(splitsies) > 1:
-                name, topic = splitsies
-            else:
-                name, topic = splitsies[0], ""
-
-            fullname, plugin = self.plugins.get(name, (name, None))
-            if self.pluginLoaded(fullname):
-                if plugin.hasattr("help"):
-                    try:
-                        out.append(plugin.help(topic))
-                    except TypeError:
-                        if topic:
-                            out.append("(Plugin doesn't support topic help)")
-                        if callable(plugin.help):
-                            out.append(plugin.help())
-                        else:
-                            out.append(str(plugin.help))
-                else:
-                    out.append("Plugin {0} has no help provided".format(name))
-            else:
-                out.append("Plugin {0} is not loaded".format(name))
+            out.append("Plugin {0} is not loaded".format(name))
 
         msg.reply_to_sender('\n'.join(out))
-
-    def help(self):
-        return "DON'T PANIC!"

=== modified file 'src/endroid/plugins/theyfightcrime.py'
--- src/endroid/plugins/theyfightcrime.py	2012-08-31 12:10:51 +0000
+++ src/endroid/plugins/theyfightcrime.py	2012-09-02 21:51:19 +0000
@@ -10,10 +10,8 @@
 # Note: that plugin doesn't seem to have an explicit license, but rbot's
 # license can be seen at http://ruby-rbot.org/rbot-trac/browser/COPYING.rbot
 
-import logging
 import random
-
-from endroid.pluginmanager import Plugin
+from endroid.plugins.command import CommandPlugin
 
 MALE_OPTIONS = (
     ('a superhumanly strong', 'an underprivileged', 'a globe-trotting',
@@ -154,28 +152,17 @@
 
     )
 
-class TheyFightCrime(Plugin):
+class TheyFightCrime(CommandPlugin):
     """
     Generates random movie titles and plots.
     """
-    name = "theyfightcrime"
-
-    def enInit(self):
-        com = self.get('endroid.plugins.command')
-        com.register_both(self.plot, ('movie', 'plot'))
-        com.register_both(self.title, ('movie', 'title'))
-
-    def dependencies(self):
-        return ('endroid.plugins.command',)
-
-    def help(self):
-        return "Generate a random movie scenario."
+    help = "Generate a random movie scenario."
 
     @staticmethod
     def get_random_things(things):
         return " ".join(map(random.choice, things))
 	
-    def plot(self, msg, arg):
+    def cmd_movie_plot(self, msg, arg):
         """
         Generate a plot for a movie.
         """
@@ -183,11 +170,8 @@
                   (self.get_random_things(MALE_OPTIONS),
                    self.get_random_things(FEMALE_OPTIONS)))
 
-    def title(self, msg, arg):
+    def cmd_movie_title(self, msg, arg):
         """
         Generate a new movie title.
         """
         msg.reply("Title: %s" % self.get_random_things(TITLE_OPTIONS))
-
-def get_plugin():
-    return TheyFightCrime()

=== modified file 'src/endroid/plugins/unhandled.py'
--- src/endroid/plugins/unhandled.py	2012-08-12 14:31:22 +0000
+++ src/endroid/plugins/unhandled.py	2012-09-02 21:51:19 +0000
@@ -1,27 +1,45 @@
+# -----------------------------------------------------------------------------
+# EnDroid - Plugin to respond to unhandled messages
+# Copyright 2012, Ensoft Ltd
+# -----------------------------------------------------------------------------
+
 from datetime import date
 import random
 from endroid.pluginmanager import Plugin
 
 class UnHandled(Plugin):
     name = "unhandled"
-    messages = ["404 Error: message not found",\
-                "Command not found, perhaps it can be found in the bottom of a locked filing cabinet stuck in a disused lavatory with a sign on the door saying Beware of the Leopard?",\
-                "Command not found. Don't Panic!",\
-                "I'm afraid I lost my Babel fish, please translate command into EnDroid.",\
-                "As you will no doubt be aware, the plans for development of the outlying regions of the Galaxy require the building of a hyperspatial express route through my code for that command.",\
-                "I seem to be having this tremendous difficulty with my lifestyle. As soon as I reach some kind of definite policy about what is my kind of music and my kind of restaurant and my kind of overdraft, people start blowing up my kind of planet, throwing me out of their kind of spaceships, and entering unrecognized commands!",\
-                "I'm afraid I won't execute that command without an order, signed in triplicate, sent in, sent back, queried, lost, found, subjected to public enquiry, lost again, and finally buried in soft peat for three months and recycled as firelighters."]
-    
-    def __init__(self):
+    help = "I'm a personality prototype. You can tell, can't you...?"
+
+    messages = [
+        "404 Error: message not found",
+        "Command not found, perhaps it can be found in the bottom of a locked "
+        "filing cabinet stuck in a disused lavatory with a sign on the door "
+        "saying Beware of the Leopard?",
+        "Command not found. Don't Panic!",
+        "I'm afraid I lost my Babel fish, please translate command into "
+        "EnDroid.",
+        "As you will no doubt be aware, the plans for development of the "
+        "outlying regions of the Galaxy require the building of a "
+        "hyperspatial express route through my code for that command.",
+        "I seem to be having this tremendous difficulty with my lifestyle. As "
+        "soon as I reach some kind of definite policy about what is my kind "
+        "of music and my kind of restaurant and my kind of overdraft, people "
+        "start blowing up my kind of planet, throwing me out of their kind of "
+        "spaceships, and entering unrecognized commands!",
+        "I'm afraid I won't execute that command without an order, signed in "
+        "triplicate, sent in, sent back, queried, lost, found, subjected to "
+        "public enquiry, lost again, and finally buried in soft peat for "
+        "three months and recycled as firelighters.",
+        ]
+
+    def endroid_init(self):
+        self.register_unhandled_chat_callback(self.unhandled)
+        self.register_unhandled_muc_callback(self.unhandled)
+
+    def unhandled(self, msg):
+        messages = self.messages
         if date.weekday(date.today()) == 3:
-            UnHandled.messages.append("This must be a Thursday, I could never get the hang of Thursdays")
-    
-    def enInit(self):
-        self.register_unhandled_chat_callback(self.unHandled)
-        self.register_unhandled_muc_callback(self.unHandled)
-        
-    def unHandled(self, msg):
-        msg.reply(random.choice(UnHandled.messages))
-
-    def help(self):
-        return "I'm a personality prototype. You can tell, can't you...?"
+            messages = messages[:] + ["This must be a Thursday, I could never "
+                                      "get the hang of Thursdays"]
+        msg.reply(random.choice(messages))

=== modified file 'src/endroid/wokkelhandler.py'
--- src/endroid/wokkelhandler.py	2012-09-01 23:15:55 +0000
+++ src/endroid/wokkelhandler.py	2012-09-02 21:51:19 +0000
@@ -97,8 +97,8 @@
         MUCClient.unavailableReceived(self, presence)
         if presence.mucStatuses:
             if presence.mucStatuses.pop().name == "KICKED":
-                # In this case, we we want presence.sender.userhostJID (room JID, rather than
-                # JID of kicker)
+                # In this case, we we want presence.sender.userhostJID (room
+                # JID, rather than JID of kicker)
                 self.usermanagement.left_room(presence.sender.userhostJID())
             else:
                 # Note that this person is unavailable