From 880952b5c3cc04570805c9ba9768884015101587 Mon Sep 17 00:00:00 2001
From: red-agent <hell.director@gmail.com>
Date: Sun, 13 Sep 2009 16:40:33 +0300
Subject: [PATCH] Few more fixes for the command system

---
 src/commands/framework.py      | 3 ++-
 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 86e890db92..30e69ad35e 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 a1a1ebf843..c2acb956ba 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):
         """
-- 
GitLab