Fix previous commit.

This commit is contained in:
Valentin Lorentz 2013-03-27 17:01:42 +01:00
parent 23e84cfff9
commit 8e1929d1b4
2 changed files with 2 additions and 3 deletions

View File

@ -289,8 +289,7 @@ class SpaceSeparatedSetOfChannels(registry.SpaceSeparatedListOf):
channels_with_key.append(channel)
else:
channels.append(channel)
return ircmsgs.join(','.join(channels_with_key + channels),
','.join(keys))
return ircmsgs.joins(channels_with_key + channels, keys)
def registerNetwork(name, password='', ssl=False, sasl_username='',
sasl_password=''):

View File

@ -615,7 +615,7 @@ def notice(recipient, s, prefix='', msg=None):
def join(channel, key=None, prefix='', msg=None):
"""Returns a JOIN to a channel"""
if conf.supybot.protocols.irc.strictRfc():
assert areChannels(channel), repr(channel)
assert isChannels(channel), repr(channel)
if msg and not prefix:
prefix = msg.prefix
if key is None: