Move code for status to reusable function

[mw] / src / mw / cli.py

diff --git a/src/mw/cli.py b/src/mw/cli.py
index e1d96c0be19141ccc5f6d62b2b2b20c7cf3e9504..50327cd6883e414c03cae0ca3f5c301336582ada 100644 (file)
--- a/src/mw/cli.py
+++ b/src/mw/cli.py
@@ -1,6 +1,6 @@
 ###
 # mw - VCS-like nonsense for MediaWiki websites
-# Copyright (C) 2009  Ian Weller <ian@ianweller.org>
+# Copyright (C) 2010  Ian Weller <ian@ianweller.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -13,16 +13,16 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###
 
-import inspect
 import mw.clicommands
 import os
 import sys
 
+
 class CLI(object):
+
     def __init__(self):
         self.me = os.path.basename(sys.argv[0])
         self.commands = {}
@@ -36,7 +36,8 @@ class CLI(object):
                 cmd = clazz()
                 self.commands[cmd.name] = cmd
                 self.shortcuts[cmd.name] = cmd.shortcuts
-        self.all_commands = self.commands
+        self.all_commands = {}
+        self.all_commands.update(self.commands)
         for command in self.shortcuts:
             for shortcut in self.shortcuts[command]:
                 self.all_commands[shortcut] = self.commands[command]
@@ -67,4 +68,4 @@ class CLI(object):
         if len(sys.argv) == 1:
             self.usage()
         # woo let's go
-        self.commands[the_command].main()
+        self.all_commands[the_command].main()