Changed to use irc.isChannel instead of ircutils.isChannel.

This commit is contained in:
Jeremy Fincher 2004-10-15 11:22:41 +00:00
parent 4a2d2a99d8
commit a9635f7547

View File

@ -67,7 +67,7 @@ class Admin(privmsgs.CapabilityCheckingPrivmsg):
def do437(self, irc, msg): def do437(self, irc, msg):
"""Nick/channel temporarily unavailable.""" """Nick/channel temporarily unavailable."""
target = msg.args[0] target = msg.args[0]
if ircutils.isChannel(target): # We don't care about nicks. if irc.isChannel(target): # We don't care about nicks.
t = time.time() + 30 t = time.time() + 30
# Let's schedule a rejoin. # Let's schedule a rejoin.
def rejoin(): def rejoin():
@ -156,7 +156,7 @@ class Admin(privmsgs.CapabilityCheckingPrivmsg):
keys.insert(0, key) keys.insert(0, key)
else: else:
channels.append(channel) channels.append(channel)
if not ircutils.isChannel(channel): if not irc.isChannel(channel):
irc.errorInvalid('channel', channel) irc.errorInvalid('channel', channel)
return return
conf.supybot.channels().add(original) conf.supybot.channels().add(original)
@ -244,7 +244,7 @@ class Admin(privmsgs.CapabilityCheckingPrivmsg):
channels = [] channels = []
reason = '' reason = ''
for (i, arg) in enumerate(args): for (i, arg) in enumerate(args):
if ircutils.isChannel(arg): if irc.isChannel(arg):
channels.append(args[i]) channels.append(args[i])
args[i] = None args[i] = None
else: else: