Fix for test failures in Fun.py.

This commit is contained in:
Jeremy Fincher 2004-12-08 07:09:40 +00:00
parent 1a63af3b26
commit c948a257fa

View File

@ -706,7 +706,7 @@ class IrcObjectProxy(RichReplyMethods):
payload = addressed(self.irc.nick, self.msg) payload = addressed(self.irc.nick, self.msg)
for (r, name) in cb.addressedRes: for (r, name) in cb.addressedRes:
if r.search(payload): if r.search(payload):
log.debug('Skipping invalidCommand: %s.%s', log.debug('Skipping tokenizedCommands: %s.%s',
cb.name(), name) cb.name(), name)
return return
# Now we call tokenizedCommands. # Now we call tokenizedCommands.
@ -787,7 +787,6 @@ class IrcObjectProxy(RichReplyMethods):
# action=True implies noLengthCheck=True and prefixName=False # action=True implies noLengthCheck=True and prefixName=False
self.noLengthCheck=noLengthCheck or self.noLengthCheck or self.action self.noLengthCheck=noLengthCheck or self.noLengthCheck or self.action
target = self.private and self.to or self.msg.args[0] target = self.private and self.to or self.msg.args[0]
s = ircutils.safeArgument(s)
if self.finalEvaled: if self.finalEvaled:
try: try:
if not isinstance(self.irc, irclib.Irc): if not isinstance(self.irc, irclib.Irc):
@ -809,6 +808,7 @@ class IrcObjectProxy(RichReplyMethods):
self.irc.queueMsg(m) self.irc.queueMsg(m)
return m return m
else: else:
s = ircutils.safeArgument(s)
allowedLength = conf.get(conf.supybot.reply.mores.length, allowedLength = conf.get(conf.supybot.reply.mores.length,
target) target)
if not allowedLength: # 0 indicates this. if not allowedLength: # 0 indicates this.