cleaned up nesting in REPL

stephentu · Mar 20, 2011 · e0dbba8 · e0dbba8
1 parent 1221146
commit e0dbba8
Showing 1 changed file with 11 additions and 12 deletions.
diff --git 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()