diff options
author | red-agent <hell.director@gmail.com> | 2009-09-13 17:40:33 +0400 |
---|---|---|
committer | red-agent <hell.director@gmail.com> | 2009-09-13 17:40:33 +0400 |
commit | 880952b5c3cc04570805c9ba9768884015101587 (patch) | |
tree | dc3a8f3d687a77fa122a10136f8af49faf681ee0 | |
parent | cae86299e496abbd2b09884d8eb8848fd3902428 (diff) |
Few more fixes for the command system
-rw-r--r-- | src/commands/framework.py | 3 | ||||
-rw-r--r-- | src/commands/implementation.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/commands/framework.py b/src/commands/framework.py index 86e890db9..30e69ad35 100644 --- a/src/commands/framework.py +++ b/src/commands/framework.py @@ -466,7 +466,8 @@ class CommandProcessor(object): optional = args[hard_len:] args = args[:hard_len] args.insert(spec_args.index('__optional__'), optional) - raise CommandInternalError("Cant have both, __optional__ and *args") + else: + raise CommandInternalError("Cant have both, __optional__ and *args") if command.dashes: for key, value in kwargs.items(): diff --git a/src/commands/implementation.py b/src/commands/implementation.py index a1a1ebf84..c2acb956b 100644 --- a/src/commands/implementation.py +++ b/src/commands/implementation.py @@ -29,8 +29,6 @@ class CommonCommands(ChatMiddleware): PrivateChatControl or GroupchatControl when command is being called. """ - IS_COMMAND_PROCESSOR = True - @command def clear(self): """ |