Improved handling of command_execution result.

* Replaces 'is' by '==' for string test.
* Explicitely looks for a ConfigNode to change current node.
* Added debugging output.
* Raise an exception on unexpected result.

1 files changed, 7 insertions, 2 deletions

diff --git a/configshell/shell.py b/configshell/shell.py
index af3137e..ab32f8e 100644
--- a/configshell/shell.py
+++ b/configshell/shell.py
@@ -25,6 +25,8 @@ import configshell.log as log
 import configshell.prefs as prefs
 import configshell.console as console
 
+from configshell.node import ConfigNode, ExecutionError
+
 # A fix for frozen packages
 import signal
 def handle_sigint(signum, frame):
@@ -898,10 +900,13 @@ class ConfigShell(object):
                 if iterall:
                     self.con.display("[%s]" % target.path)
                 result = target.execute_command(command, pparams, kparams)
-            if result is 'EXIT':
+            self.log.debug("Command execution returned %r" % result)
+            if isinstance(result, ConfigNode):
+                self._current_node = result
+            elif result == 'EXIT':
                 self._exit = True
             elif result is not None:
-                self._current_node = result
+                raise ExecutionError("Unexpected result: %r" % result)
 
     # Public methods