Changes in code to run in Python3

Author: Ezetowers

MLC/Common/LispTreeExpr/LispTreeExpr.py

@@ -78,7 +78,9 @@ def __init__(self, expression):
 
 
 class LispTreeExpr(object):
+
     class NodeIdGenerator(object):
+
         def __init__(self):
             self._node_id_counter = 0
 
@@ -135,7 +137,7 @@ def check_expression(expression):
         close_parenthesis = ")"
         string_to_find = open_parenthesis
         counter = 0
-        for index in xrange(len(expression)):
+        for index in range(len(expression)):
             if expression[index] == open_parenthesis:
                 counter += 1
             elif expression[index] == close_parenthesis:
@@ -315,10 +317,10 @@ def _generate_leaf_node(self, expr, parent_depth, expr_index):
         return leaf, param_len + 1
 
     # As a precondition, the expression must be well-formed
-    def _generate_node(self, 
-                       expr, 
-                       is_root_expression=False, 
-                       parent_depth=0, 
+    def _generate_node(self,
+                       expr,
+                       is_root_expression=False,
+                       parent_depth=0,
                        expr_index=0):
         if expr[0] != '(':
             return self._generate_leaf_node(expr, parent_depth, expr_index)
@@ -340,8 +342,8 @@ def _generate_node(self,
             next_arg_pos = 1 + len(op["op"]) + 1 + expr_offset
 
             if expr[next_arg_pos] == '(':
-                child_node, offset = self._generate_node(expr[next_arg_pos:], 
-                                                         parent_depth=parent_depth + 1, 
+                child_node, offset = self._generate_node(expr[next_arg_pos:],
+                                                         parent_depth=parent_depth + 1,
                                                          expr_index=expr_index + next_arg_pos)
             else:
                 child_node, offset = self._generate_leaf_node(expr[next_arg_pos:],

MLC/Common/LispTreeExpr/OperationNodes.py

@@ -76,7 +76,7 @@ def op_simplify(self):
     def op_compute(self, arg_list):
         try:
             return arg_list[0] + arg_list[1]
-        except FloatingPointError, err:
+        except FloatingPointError as err:
             return execute_op_without_warnings(op=np.add,
                                                arg1=arg_list[0],
                                                arg2=arg_list[1],
@@ -111,7 +111,7 @@ def op_simplify(self):
     def op_compute(self, arg_list):
         try:
             return arg_list[0] - arg_list[1]
-        except FloatingPointError, err:
+        except FloatingPointError as err:
             return execute_op_without_warnings(op=np.subtract,
                                                arg1=arg_list[0],
                                                arg2=arg_list[1],
@@ -147,7 +147,7 @@ def op_simplify(self):
     def op_compute(self, arg_list):
         try:
             return arg_list[0] * arg_list[1]
-        except FloatingPointError, err:
+        except FloatingPointError as err:
             return execute_op_without_warnings(op=np.multiply,
                                                arg1=arg_list[0],
                                                arg2=arg_list[1],
@@ -197,7 +197,7 @@ def op_simplify(self):
     def op_compute(self, arg_list):
         try:
             return self._process_division(arg_list[0], arg_list[1])
-        except FloatingPointError, err:
+        except FloatingPointError as err:
             return execute_op_without_warnings(op=self._process_division,
                                                arg1=arg_list[0],
                                                arg2=arg_list[1],
@@ -223,7 +223,7 @@ def op_simplify(self):
     def op_compute(self, arg_list):
         try:
             return np.sin(arg_list[0])
-        except FloatingPointError, err:
+        except FloatingPointError as err:
             return execute_op_without_warnings(op=np.sin,
                                                arg1=arg_list[0],
                                                log_prefix="[SIN_NODE] Error: ",
@@ -248,7 +248,7 @@ def op_simplify(self):
     def op_compute(self, arg_list):
         try:
             return np.cos(arg_list[0])
-        except FloatingPointError, err:
+        except FloatingPointError as err:
             return execute_op_without_warnings(op=np.cos,
                                                arg1=arg_list[0],
                                                log_prefix="[COS_NODE] Error: ",
@@ -288,7 +288,7 @@ def op_simplify(self):
     def op_compute(self, arg_list):
         try:
             return np.log(self._process_arg(arg_list[0]))
-        except FloatingPointError, err:
+        except FloatingPointError as err:
             return execute_op_without_warnings(op=lambda x: np.log(self._process_arg(x)),
                                                arg1=arg_list[0],
                                                log_prefix="[LOG_NODE] Error: ",
@@ -320,7 +320,7 @@ def op_simplify(self):
     def op_compute(self, arg_list):
         try:
             return np.exp(arg_list[0])
-        except FloatingPointError, err:
+        except FloatingPointError as err:
             return execute_op_without_warnings(op=np.exp,
                                                arg1=arg_list[0],
                                                log_prefix="[EXP_NODE] Error: ",
@@ -345,7 +345,7 @@ def op_simplify(self):
     def op_compute(self, arg_list):
         try:
             return np.tanh(arg_list[0])
-        except FloatingPointError, err:
+        except FloatingPointError as err:
             return execute_op_without_warnings(op=np.exp,
                                                arg1=arg_list[0],
                                                log_prefix="[TANH_NODE] Error: ",

MLC/Common/Operations.py

@@ -24,6 +24,8 @@
 from MLC import config as mlc_paths
 
 import os
+
+
 class Operations(object):
     """
     Singleton class gives information about the tree functions availables at
@@ -44,14 +46,14 @@ def __init__(self):
 
     def get_operation_from_op_num(self, op_num_index):
         try:
-            return self._ops.values()[int(op_num_index) - 1]
+            return list(self._ops.values())[int(op_num_index) - 1]
         except KeyError:
             raise IndexError("get_operation_from_op_num",
                              "Index must be one of the following values: {0}"
                              .format(str(self._ops.keys())))
 
     def get_operation_from_op_string(self, str_op):
-        for k, op in self._ops.iteritems():
+        for k, op in self._ops.items():
             if op["op"] == str_op:
                 return op
         raise KeyError('Operations', 'Key %s was not found' % str_op)

MLC/Common/PreevaluationManager.py

@@ -42,29 +42,27 @@ def get_callback():
             function_name = Config.get_instance().get('EVALUATOR', 'preev_function')
             module_name = "Preevaluation.{0}".format(function_name)
 
-            try:
-                # WARNING: I am unloading manually the evaluation function module. I need to do this
-                # because Python does not support module unloading and my evaluation functions are
-                # all the same, so when one experiment loads his module, other project with the same
-                # name of module won't be able to load yours
-                preev_module = sys.modules["Preevaluation"]
-                del sys.modules['Preevaluation']
-                del preev_module
-                lg.logger_.debug("[EV_FACTORY] Module {0} was removed"
-                                 .format(sys.modules["Preevaluation"]))
-            except KeyError, err:
-                # If the module cannot be unload because it does not exists, continue
-                pass
+            # try:
+            #     # WARNING: I am unloading manually the evaluation function module. I need to do this
+            #     # because Python does not support module unloading and my evaluation functions are
+            #     # all the same, so when one experiment loads his module, other project with the same
+            #     # name of module won't be able to load yours
+            #     preev_module = sys.modules["Preevaluation"]
+            #     del sys.modules['Preevaluation']
+            #     del preev_module
+            #     lg.logger_.debug("[EV_FACTORY] Module {0} was removed"
+            #                      .format(sys.modules["Preevaluation"]))
+            # except KeyError as err:
+            #     # If the module cannot be unload because it does not exists, continue
+            #     pass
 
             lg.logger_.debug('[PREEV_MANAGER] Importing module {0}'.format(module_name))
             try:
                 module = importlib.import_module(module_name)
-                reload(module)
+                importlib.reload(module)
                 return module
             except ImportError:
                 lg.logger_.debug("[PREEV_MANAGER] Preevaluation function doesn't exists. " +
                                  "Aborting program...")
                 sys.exit(-1)
         return None
-
-

MLC/Common/RandomManager.py

@@ -67,7 +67,7 @@ def randperm(n):
         RandomManager._rand_counter += n
         rand_list = []
 
-        for _ in xrange(n):
+        for _ in range(n):
             if not len(RandomManager._randoms):
                 rand_list.append(random.random())
             else:

MLC/GUI/Common/util.py

@@ -48,7 +48,7 @@ def test_individual_value(parent, experiment_name, log_prefix, indiv_value, conf
                                          rhs_value=indiv_value)
         callback = EvaluatorFactory.get_callback()
         return callback.cost(individual)
-    except ExprException, err:
+    except ExprException as err:
         # Print the error message returned in the exception,
         # removing the prefix ([EXPR_EXCEPTION]])
         QMessageBox.critical(parent,
@@ -61,7 +61,7 @@ def test_individual_value(parent, experiment_name, log_prefix, indiv_value, conf
                      "Error Msg: {2}"
                      .format(log_prefix, experiment_name,
                              err.message[err.message.find(']') + 2:]))
-    except Exception, err:
+    except Exception as err:
         QMessageBox.critical(parent,
                              "Invalid Evaluation Script",
                              "Check the evaluation script to be correct. "
@@ -84,7 +84,7 @@ def check_individual_value(parent, experiment_name, log_prefix, indiv_value, nod
         """
         LispTreeExpr.check_expression(indiv_value)
         return True
-    except ExprException, err:
+    except ExprException as err:
         # Print the error message returned in the exception,
         # removing the prefix ([EXPR_EXCEPTION]])
         if not nodialog:
@@ -111,7 +111,7 @@ def check_if_indiv_pass_preevaluation(parent, experiment_name, log_prefix, indiv
                                          rhs_value=indiv_value)
         callback = PreevaluationManager.get_callback()
         return callback.preev(individual)
-    except ExprException, err:
+    except ExprException as err:
         # Print the error message returned in the exception,
         # removing the prefix ([EXPR_EXCEPTION]])
         QMessageBox.critical(parent,
@@ -124,7 +124,7 @@ def check_if_indiv_pass_preevaluation(parent, experiment_name, log_prefix, indiv
                      "Error Msg: {2}"
                      .format(log_prefix, experiment_name,
                              err.message[err.message.find(']') + 2:]))
-    except Exception, err:
+    except Exception as err:
         QMessageBox.critical(parent,
                              "Invalid Evaluation Script",
                              "Check the evaluation script to be correct. "
@@ -148,4 +148,4 @@ def add_permissions_to_file(filepath, permissions, user_password=None):
         os.system('sudo -K')
         return cmd_error_code == 0
     else:
-        return os.system(cmd) == 0
+        return os.system(cmd) == 0

MLC/GUI/Experiment/ArduinoConfigManager/ArduinoBoardManager.py

@@ -19,8 +19,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>
 
-from ArduinoBench import ArduinoBench
-
+from MLC.GUI.Experiment.ArduinoConfigManager.ArduinoBench import ArduinoBench
 from MLC.GUI.Experiment.ArduinoConfigManager.ArduinoStatsDialog import ArduinoStatsDialog
 from MLC.GUI.Experiment.ArduinoConfigManager.BoardConfigurationWindow import BoardConfigurationWindow
 from MLC.arduino import boards
@@ -147,7 +146,7 @@ def conn_check(self, conn):
             self.__connection_status.set_error("Error: connection timeout")
         except ConnectionException:
             self.__connection_status.set_error("Error: Board unreachable")
-        except ValueError, err:
+        except ValueError as err:
             self.__connection_status.set_error("Error: {0}".format(err))
 
     def board_changed(self, new_idx, old_idx):

MLC/GUI/Experiment/ArduinoConfigManager/BoardConfigurationWindow.py

@@ -52,7 +52,7 @@ def __init__(self, controller, boards, setup, parent=None):
         self.__boards = boards
         self.__setup = setup
         self.__board_idx = 0
-        #Disabled by the moment -- ethernet not yet supported!
+        # Disabled by the moment -- ethernet not yet supported!
         self.ui.ethernet_radio.setDisabled(True)
 
         current_board = 0
@@ -97,10 +97,10 @@ def update(self, setup):
             aux_idx += 1
 
         # Clear the list (QTableWidget.clearContent doesn't remove the rows!)
-        for i in xrange(self.ui.digitalPinsList.rowCount(), -1, -1):
+        for i in range(self.ui.digitalPinsList.rowCount(), -1, -1):
             self.ui.digitalPinsList.removeRow(i)
 
-        for i in xrange(self.ui.analogPinList.rowCount(), -1, -1):
+        for i in range(self.ui.analogPinList.rowCount(), -1, -1):
             self.ui.analogPinList.removeRow(i)
 
         for pin in setup.digital_input_pins:
@@ -145,11 +145,11 @@ def on_analog_resolution_change(self, index):
     def checkout_connection_config(self):
         # TODO Renombrar para checkout de parametros de conexion serie
         serial_config = {
-                        "baudrate": int(self.ui.baud_rate_selector.currentText()),
-                        "parity": self.ui.parity_bits_selector.currentIndex(),
-                        "stopbits": self.ui.stop_bits_selector.currentIndex(),
-                        "bytesize": self.ui.byte_size_selector.currentIndex(),
-                        "port": self.ui.interface_combo.currentText()}
+            "baudrate": int(self.ui.baud_rate_selector.currentText()),
+            "parity": self.ui.parity_bits_selector.currentIndex(),
+            "stopbits": self.ui.stop_bits_selector.currentIndex(),
+            "bytesize": self.ui.byte_size_selector.currentIndex(),
+            "port": self.ui.interface_combo.currentText()}
         return serial_config
 
     def checkout_board_setup(self):
@@ -242,7 +242,7 @@ def on_bench_test_click(self):
         self.__controller.start_bench()
 
     def on_connection_type_toggle(self):
-        #TBD
+        # TBD
         pass
 
     def on_permission_button_clicked(self):