Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-12-23 11:12:47 +01:00
Code Issues Projects Releases Wiki Activity

Revert the previous 'fix' since to can never be None at that point. Also,

Browse Source 
remove those evil lines full of white-space!
This commit is contained in:
James Vega 2004-07-07 18:04:55 +00:00
parent e5e1f2e84e
commit 7fbb6daa15
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/callbacks.py
View File

@ -125,7 +125,7 @@ def canonicalName(command):
def reply(msg, s, prefixName=True, private=False, def reply(msg, s, prefixName=True, private=False,
notice=False, to=None, action=False): notice=False, to=None, action=False):
# This is so we don't prefix a channel name. # This is so we don't prefix a channel name.
# Ok, let's make the target: # Ok, let's make the target:
target = ircutils.replyTo(msg) target = ircutils.replyTo(msg)
if private: if private:
@ -140,11 +140,11 @@ def reply(msg, s, prefixName=True, private=False,
if not s: if not s:
s = 'Error: I tried to send you an empty message.' s = 'Error: I tried to send you an empty message.'
# Let's may sure we don't do, "#channel: foo.". # Let's may sure we don't do, "#channel: foo.".
if to is None and prefixName and not ircutils.isChannel(to): if prefixName and not ircutils.isChannel(to):
s = '%s: %s' % (to, s) s = '%s: %s' % (to, s)
# And now, let's decide whether it's a PRIVMSG or a NOTICE. # And now, let's decide whether it's a PRIVMSG or a NOTICE.
msgmaker = ircmsgs.privmsg msgmaker = ircmsgs.privmsg
if notice: if notice:
msgmaker = ircmsgs.notice msgmaker = ircmsgs.notice
if conf.supybot.reply.withPrivateNotice(): if conf.supybot.reply.withPrivateNotice():
target = msg.nick target = msg.nick
@ -434,7 +434,7 @@ class RichReplyMethods(object):
v = conf.supybot.replies.requiresPrivacy.get(self.msg.args[0])() v = conf.supybot.replies.requiresPrivacy.get(self.msg.args[0])()
self.error(self.__makeReply(v, s), **kwargs) self.error(self.__makeReply(v, s), **kwargs)
class IrcObjectProxy(RichReplyMethods): class IrcObjectProxy(RichReplyMethods):
"A proxy object to allow proper nested of commands (even threaded ones)." "A proxy object to allow proper nested of commands (even threaded ones)."
def __init__(self, irc, msg, args): def __init__(self, irc, msg, args):
@ -463,7 +463,7 @@ class IrcObjectProxy(RichReplyMethods):
self.private = False self.private = False
self.noLengthCheck = False self.noLengthCheck = False
self.prefixName = conf.supybot.reply.withNickPrefix() self.prefixName = conf.supybot.reply.withNickPrefix()
def evalArgs(self): def evalArgs(self):
while self.counter < len(self.args): while self.counter < len(self.args):
if type(self.args[self.counter]) == str: if type(self.args[self.counter]) == str:
@ -507,7 +507,7 @@ class IrcObjectProxy(RichReplyMethods):
self.replyError() self.replyError()
finally: finally:
self.commandMethod = None self.commandMethod = None
def finalEval(self): def finalEval(self):
assert not self.finalEvaled, 'finalEval called twice.' assert not self.finalEvaled, 'finalEval called twice.'
self.finalEvaled = True self.finalEvaled = True
@ -731,7 +731,7 @@ class Privmsg(irclib.IrcCallback):
canonicalname = canonicalName(myName) canonicalname = canonicalName(myName)
self._original = getattr(self, canonicalname, None) self._original = getattr(self, canonicalname, None)
docstring = """<command> [<args> ...] docstring = """<command> [<args> ...]
Command dispatcher for the %s plugin. Use 'list %s' to see the Command dispatcher for the %s plugin. Use 'list %s' to see the
commands provided by this plugin. Use 'config list plugins.%s' to see commands provided by this plugin. Use 'config list plugins.%s' to see
the configuration values for this plugin. In most cases this dispatcher the configuration values for this plugin. In most cases this dispatcher
@ -855,7 +855,7 @@ class Privmsg(irclib.IrcCallback):
group.setValue(value) group.setValue(value)
else: else:
group.set(value) group.set(value)
class IrcObjectProxyRegexp(RichReplyMethods): class IrcObjectProxyRegexp(RichReplyMethods):
def __init__(self, irc, msg): def __init__(self, irc, msg):
@ -998,6 +998,6 @@ class PrivmsgCommandAndRegexp(Privmsg):
proxy = self.Proxy(irc, msg) proxy = self.Proxy(irc, msg)
self.callCommand(method,proxy,msg,m,catchErrors=True) self.callCommand(method,proxy,msg,m,catchErrors=True)
Privmsg.handled = True Privmsg.handled = True
# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: # vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: