matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

[commands] Raise RuntimeError instead of StopIteration.

Browse Source
This commit is contained in:
Rapptz 2016-02-06 01:38:41 -05:00
parent b9873ea04e
commit baf1312d0e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
discord/ext/commands/core.py
View File

@ -227,7 +227,7 @@ class Command:
if view.eof: if view.eof:
if param.kind == param.VAR_POSITIONAL: if param.kind == param.VAR_POSITIONAL:
raise StopIteration() # break the loop raise RuntimeError() # break the loop
if required: if required:
raise MissingRequiredArgument('{0.name} is a required argument that is missing.'.format(param)) raise MissingRequiredArgument('{0.name} is a required argument that is missing.'.format(param))
return param.default return param.default
@ -306,8 +306,9 @@ class Command:
try: try:
transformed = yield from self.transform(ctx, param) transformed = yield from self.transform(ctx, param)
args.append(transformed) args.append(transformed)
except StopIteration: except RuntimeError:
break break
except CommandError as e: except CommandError as e:
self.handle_local_error(e, ctx) self.handle_local_error(e, ctx)
ctx.bot.dispatch('command_error', e, ctx) ctx.bot.dispatch('command_error', e, ctx)