plugins/Ctcp: Fix another utils.commaAndify bug.

This commit is contained in:
James Vega 2005-05-19 23:52:53 +00:00
parent 8730832e69
commit 5e07947f74

View File

@ -40,7 +40,7 @@ import supybot.callbacks as callbacks
class Ctcp(callbacks.PluginRegexp): class Ctcp(callbacks.PluginRegexp):
public = False public = False
regexps = ('ctcpPing', 'ctcpVersion', 'ctcpUserinfo', regexps = ('ctcpPing', 'ctcpVersion', 'ctcpUserinfo',
'ctcpTime', 'ctcpFinger', 'ctcpSource') 'ctcpTime', 'ctcpFinger', 'ctcpSource')
def __init__(self, irc): def __init__(self, irc):
self.__parent = super(Ctcp, self) self.__parent = super(Ctcp, self)
self.__parent.__init__(irc) self.__parent.__init__(irc)
@ -66,7 +66,7 @@ class Ctcp(callbacks.PluginRegexp):
self.ignores[ignoreMask] = now + expires self.ignores[ignoreMask] = now + expires
return return
self.__parent.callCommand(command, irc, msg, *args, **kwargs) self.__parent.callCommand(command, irc, msg, *args, **kwargs)
def _reply(self, irc, msg, s): def _reply(self, irc, msg, s):
s = '\x01%s\x01' % s s = '\x01%s\x01' % s
irc.reply(s, notice=True, private=True, to=msg.nick) irc.reply(s, notice=True, private=True, to=msg.nick)
@ -115,7 +115,7 @@ class Ctcp(callbacks.PluginRegexp):
return return
if version == 'VERSION': if version == 'VERSION':
self.versions.setdefault(payload, []).append(msg.nick) self.versions.setdefault(payload, []).append(msg.nick)
def version(self, irc, msg, args, channel, optlist): def version(self, irc, msg, args, channel, optlist):
"""[<channel>] [--nicks] """[<channel>] [--nicks]
@ -139,7 +139,7 @@ class Ctcp(callbacks.PluginRegexp):
L.append(format('%L responded with %q', nicks, reply)) L.append(format('%L responded with %q', nicks, reply))
else: else:
L.append(reply) L.append(reply)
irc.reply(utils.commaAndify(L)) irc.reply(format('%L', L))
else: else:
irc.reply('I received no version responses.') irc.reply('I received no version responses.')
wait = self.registryValue('versionWait') wait = self.registryValue('versionWait')