Merge branch 'maint/0.83.4'

README

@@ -1,6 +1,6 @@
 EVERYONE:
 ---------
-Read LICENSE.  It's a 2-clause BSD license, but you should read it
+Read LICENSE.  It's a 3-clause BSD license, but you should read it
 anyway.
 
 USERS:

plugins/Owner/plugin.py

@@ -315,7 +315,8 @@ class Owner(callbacks.Plugin):
             irc.errorInvalid('command', command)
         elif plugin:
             if not plugin.isCommand(command):
-                irc.errorInvalid('command in the %s plugin' % plugin, command)
+                irc.errorInvalid('command in the %s plugin' % plugin.name(),
+                                 command)
             registerDefaultPlugin(command, plugin.name())
             irc.replySuccess()
         else:

plugins/Unix/plugin.py

@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2008-2009, James Vega
+# Copyright (c) 2008-2010, James Vega
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -137,9 +137,6 @@ class Unix(callbacks.Plugin):
         if word and not word[0].isalpha():
             irc.error('<word> must begin with an alphabet character.')
             return
-        if ' ' in word:
-            irc.error('Spaces aren\'t allowed in the word.')
-            return
         try:
             inst = subprocess.Popen([spellCmd, '-a'], close_fds=True,
                                     stdout=subprocess.PIPE,
@@ -181,7 +178,7 @@ class Unix(callbacks.Plugin):
         else:
             resp = 'Something unexpected was seen in the [ai]spell output.'
         irc.reply(resp)
-    spell = wrap(spell, ['something'])
+    spell = wrap(spell, ['somethingWithoutSpaces'])
 
     def fortune(self, irc, msg, args):
         """takes no arguments

src/log.py

@@ -259,11 +259,11 @@ conf.registerGlobalValue(conf.supybot.log, 'timestampFormat',
     format."""))
 
 class BooleanRequiredFalseOnWindows(registry.Boolean):
+    """Value cannot be true on Windows"""
     def set(self, s):
         registry.Boolean.set(self, s)
         if self.value and os.name == 'nt':
-            raise registry.InvalidRegistryValue, \
-                  'Value cannot be true on Windows.'
+            self.error()
 
 conf.registerGlobalValue(conf.supybot.log, 'stdout',
     registry.Boolean(True, """Determines whether the bot will log to