Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-18 14:40:51 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'maint/0.83.4'

Browse Source
This commit is contained in:
James Vega 2010-09-20 19:46:18 -04:00
commit 26a458b9ec
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@ -1,6 +1,6 @@
EVERYONE: 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. anyway.
USERS: USERS:

3
plugins/Owner/plugin.py
View File

@ -315,7 +315,8 @@ class Owner(callbacks.Plugin):
irc.errorInvalid('command', command) irc.errorInvalid('command', command)
elif plugin: elif plugin:
if not plugin.isCommand(command): 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()) registerDefaultPlugin(command, plugin.name())
irc.replySuccess() irc.replySuccess()
else: else:

7
plugins/Unix/plugin.py
View File

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

4
src/log.py
View File

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