Exception message field and raw_input()

Author: azuresol

bessctl/bessctl

@@ -69,7 +69,7 @@ class BESSCLI(cli.CLI):
 
         except self.bess.RPCError as e:
             self.err('RPC failed to {}:{} - {}'.format(
-                self.bess.peer[0], self.bess.peer[1], e.message))
+                self.bess.peer[0], self.bess.peer[1], str(e)))
 
             self._handle_broken_connection()
             raise self.HandledError()
@@ -121,7 +121,7 @@ def run_cli(instream=sys.stdin):
         s.connect()
     except BESS.APIError as e:
         if cli.interactive:
-            cli.ferr.write(e.message + '\n')
+            cli.ferr.write(str(e) + '\n')
             cli.ferr.write('Perhaps bessd daemon is not running locally? '
                            'Try "daemon start".\n')
 

bessctl/cli.py

@@ -370,12 +370,12 @@ def print_banner(self):
 
     def process_one_line(self):
         if self.interactive:
-            try:    # Hack for Python 2/3 compatibility
-                input = raw_input
-            except NameError:
-                pass
             try:
-                line = input(self.get_prompt())
+                # Hack for Python 2/3 compatibility
+                if hasattr(__builtins__, 'raw_input'):
+                    line = raw_input(self.get_prompt())
+                else:
+                    line = input(self.get_prompt())
             except KeyboardInterrupt:
                 self.fout.write('\n')
                 return

bessctl/commands.py

@@ -545,13 +545,13 @@ def warn(cli, msg, func, *args):
         if cli.rl:
             cli.rl.set_completer(cli.complete_dummy)
 
-        try:    # Hack for compatibility
-            input = raw_input
-        except NameError:
-            pass
-
         try:
-            resp = input('WARNING: %s Are you sure? (type "yes") ' % msg)
+            # Hack for Python 2/3 compatibility
+            if hasattr(__builtins__, 'raw_input'):
+                resp = raw_input(
+                    'WARNING: %s Are you sure? (type "yes") ' % msg)
+            else:
+                resp = input('WARNING: %s Are you sure? (type "yes") ' % msg)
 
             if resp.strip() == 'yes':
                 func(cli, *args)