beremiz: comparison etherlab/EthercatCFileGenerator.py

equal deleted inserted replaced

-:88a9d64560d3
+:7aa47c09f8f5
 def ConfigureVariable(entry_infos, str_completion):
 entry_infos["data_type"] = DATATYPECONVERSION.get(entry_infos["var_type"], None)
 if entry_infos["data_type"] is None:
-raise ValueError, _("Type of location \"%s\" not yet supported!") % entry_infos["var_name"]
+msg = _("Type of location \"%s\" not yet supported!") % entry_infos["var_name"]
+raise ValueError(msg)
 if not entry_infos.get("no_decl", False):
 if "real_var" in entry_infos:
 str_completion["located_variables_declaration"].append(
 "IEC_%(var_type)s %(real_var)s;" % entry_infos)
 if name != entry_infos["infos"][2]:
 if dir == "I":
 entry_infos["infos"][4].append(name)
 return entry_infos["infos"][2]
 else:
-raise ValueError, _("Output variables can't be defined with different locations (%s and %s)") % (entry_infos["infos"][2], name)
+msg = _("Output variables can't be defined with different locations (%s and %s)") \
+% (entry_infos["infos"][2], name)
+raise ValueError(msg)
 else:
-raise ValueError, _("Definition conflict for location \"%s\"") % name
+raise ValueError(_("Definition conflict for location \"%s\"") % name)
 def GenerateCFile(self, filepath, location_str, master_number):
 # Extract etherlab master code template
 plc_etherlab_filepath = os.path.join(os.path.split(__file__)[0], "plc_etherlab.c")
 slave_pos = (slave_alias, alias[slave_alias])
 # Extract slave device informations
 device, module_extra_params = self.Controler.GetModuleInfos(type_infos)
 if device is None:
-raise ValueError, _("No informations found for device %s!") % (type_infos["device_type"])
+msg = _("No informations found for device %s!") \
+% (type_infos["device_type"])
+raise ValueError(msg)
 # Extract slaves variables to be mapped
 slave_variables = self.UsedVariables.get(slave_idx, {})
 # Extract slave device object dictionary entries
 entry_type = entry.getDataType().getcontent()
 if entry_infos["var_type"] != entry_type:
 message = _("Wrong type for location \"%s\"!") % entry_infos["var_name"]
 if (self.Controler.GetSizeOfType(entry_infos["var_type"]) !=
 self.Controler.GetSizeOfType(entry_type)):
-raise ValueError, message
+raise ValueError(message)
 else:
 self.Controler.GetCTRoot().logger.write_warning(_("Warning: ") + message + "\n")
 if (entry_infos["dir"] == "I" and pdo_type != "Inputs" or
 entry_infos["dir"] == "Q" and pdo_type != "Outputs"):
-raise ValueError, _("Wrong direction for location \"%s\"!") % entry_infos["var_name"]
+raise ValueError(_("Wrong direction for location \"%s\"!") % entry_infos["var_name"])
 ConfigureVariable(entry_infos, str_completion)
 elif pdo_type == "Outputs" and entry.getDataType() is not None and device_coe is not None:
 data_type = entry.getDataType().getcontent()
 if sm is None:
 for sm_idx, sync_manager in enumerate(sync_managers):
 if sync_manager["name"] == pdo_type:
 sm = sm_idx
 if sm is None:
-raise ValueError, _("No sync manager available for %s pdo!") % pdo_type
+raise ValueError(_("No sync manager available for %s pdo!") % pdo_type)
 sync_managers[sm]["pdos_number"] += 1
 sync_managers[sm]["pdos"].append(
 {"slave": slave_idx,
 "index": pdo_index,
 for (index, subindex), entry_declaration in slave_variables.iteritems():
 if not entry_declaration["mapped"]:
 entry = device_entries.get((index, subindex), None)
 if entry is None:
-raise ValueError, _("Unknown entry index 0x%4.4x, subindex 0x%2.2x for device %s") % \
+msg = _("Unknown entry index 0x%4.4x, subindex 0x%2.2x for device %s") \
-(index, subindex, type_infos["device_type"])
+% (index, subindex, type_infos["device_type"])
+raise ValueError(msg)
 entry_infos = {
 "index": index,
 "subindex": subindex,
 "name": entry["Name"],
 if entry_infos["var_type"] != entry["Type"]:
 message = _("Wrong type for location \"%s\"!") % entry_infos["var_name"]
 if (self.Controler.GetSizeOfType(entry_infos["var_type"]) !=
 self.Controler.GetSizeOfType(entry["Type"])):
-raise ValueError, message
+raise ValueError(message)
 else:
 self.Controler.GetCTRoot().logger.write_warning(message + "\n")
 if entry_infos["dir"] == "I" and entry["PDOMapping"] in ["T", "RT"]:
 pdo_type = "Inputs"
 elif entry_infos["dir"] == "Q" and entry["PDOMapping"] in ["R", "RT"]:
 pdo_type = "Outputs"
 else:
-raise ValueError, _("Wrong direction for location \"%s\"!") % entry_infos["var_name"]
+msg = _("Wrong direction for location \"%s\"!") \
+% entry_infos["var_name"]
+raise ValueError(msg)
 if pdo_type not in dynamic_pdos:
-raise ValueError, _("No Sync manager defined for %s!") % pdo_type
+msg = _("No Sync manager defined for %s!") % pdo_type
+raise ValueError(msg)
 ConfigureVariable(entry_infos, str_completion)
 if len(dynamic_pdos[pdo_type]["pdos"]) > 0:
 pdo = dynamic_pdos[pdo_type]["pdos"][0]
 elif module_extra_params["add_pdo"]:
 while dynamic_pdos[pdo_type]["current_index"] in pdos_index:
 dynamic_pdos[pdo_type]["current_index"] += 1
 if dynamic_pdos[pdo_type]["current_index"] >= dynamic_pdos[pdo_type]["max_index"]:
-raise ValueError, _("No more free PDO index available for %s!") % pdo_type
+raise ValueError(_("No more free PDO index available for %s!") % pdo_type)
 pdos_index.append(dynamic_pdos[pdo_type]["current_index"])
 dynamic_pdos_number += 1
 pdo = {"slave": slave_idx,
 "index": dynamic_pdos[pdo_type]["current_index"],

changeset 2378	7aa47c09f8f5
parent 2377	88a9d64560d3
child 2379	015b724c30a5