From e0dbba85f3d7af58d14e983f04241d1de3b3cf92 Mon Sep 17 00:00:00 2001 From: Michael Driscoll Date: Sun, 20 Mar 2011 10:33:20 -0400 Subject: [PATCH] cleaned up nesting in REPL --- console.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/console.py b/console.py index 5f8fb0c..462a997 100755 --- a/console.py +++ b/console.py @@ -269,18 +269,17 @@ def complete(self, text, state): if cmd: tokens = re.split('\s*', cmd.strip()) cmdtoken = tokens[0] - if cmdtoken in COMMANDS.keys(): - try: - COMMANDS[cmdtoken][0](tokens) - except NotLoggedInException: - print "You need to be logged in. Type 'login' to do so." - #except Exception as ex: - # print "Caught unexpected exception:", ex.value - # exc_type, exc_value, exc_traceback = sys.exc_info() - # traceback.print_exception(exc_type, exc_value, exc_traceback, - # limit=10, file=sys.stdout) - else: - print "Unknown command: %s" % tokens[0] + try: + COMMANDS[cmdtoken][0](tokens) + except NotLoggedInException: + print "You need to be logged in. Type 'login' to do so." + except KeyError: + print "Unknown command:", cmdtoken + #except Exception as ex: + # print "Caught unexpected exception:", ex.value + # exc_type, exc_value, exc_traceback = sys.exc_info() + # traceback.print_exception(exc_type, exc_value, exc_traceback, + # limit=10, file=sys.stdout) except EOFError: print __handle__exit()