Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Must've forgotten to commit this earlier.

This commit is contained in:
Jeremy Fincher 2003-04-11 21:10:17 +00:00
parent 9253ce5adc
commit e5c58089ce
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/privmsgs.py
View File

@ -50,14 +50,13 @@ def getChannel(msg, args):
If the channel was given in args, args is modified (the channel is
removed).
"""
if ircutils.isChannel(msg.args[0]):
if args and ircutils.isChannel(args[0]):
return args.pop(0)
elif ircutils.isChannel(msg.args[0]):
return msg.args[0]
else:
if len(args) > 0:
return args.pop(0)
else:
raise callbacks.Error, 'Command must be sent in a channel or ' \
'include a channel in its arguments.'
raise callbacks.Error, 'Command must be sent in a channel or ' \
'include a channel in its arguments.'
def getArgs(args, needed=1, optional=0):
"""Take the needed arguments from args.