beremiz: comparison ProjectController.py

equal deleted inserted replaced

-:fda6c1a37662
+:f62625418bff
 """
 Beremiz Project Controller
 """
-from __future__ import absolute_import
 import os
 import traceback
 import time
 from time import localtime
 import shutil
 import tempfile
 import hashlib
 from datetime import datetime
 from weakref import WeakKeyDictionary
 from functools import reduce
-from itertools import izip
 from distutils.dir_util import copy_tree
 from six.moves import xrange
 import wx
 for lib in self.Libraries:
 res = lib.Generate_C(buildpath, self._VariablesList, LibIECCflags)
 LocatedCCodeAndFlags.append(res[:2])
 if len(res) > 2:
 Extras.extend(res[2:])
-return map(list, zip(*LocatedCCodeAndFlags)) + [tuple(Extras)]
+return list(map(list, list(zip(*LocatedCCodeAndFlags)))) + [tuple(Extras)]
 # Update PLCOpenEditor ConfNode Block types from loaded confnodes
 def RefreshConfNodesBlockLists(self):
 if getattr(self, "Children", None) is not None:
 self.ClearConfNodeTypes()
 if not C_files:
 self.logger.write_error(
 _("Error : At least one configuration and one resource must be declared in PLC !\n"))
 return False
 # transform those base names to full names with path
-C_files = map(
+C_files = [os.path.join(buildpath, filename) for filename in C_files]
-lambda filename: os.path.join(buildpath, filename), C_files)
 # prepend beremiz include to configuration header
 H_files = [fname for fname in result.splitlines() if fname[
 -2:] == ".h" or fname[-2:] == ".H"]
 H_files.remove("LOCATED_VARIABLES.h")
-H_files = map(
+H_files = [os.path.join(buildpath, filename) for filename in H_files]
-lambda filename: os.path.join(buildpath, filename), H_files)
 for H_file in H_files:
 with open(H_file, 'r') as original:
 data = original.read()
 with open(H_file, 'w') as modified:
 modified.write('#include "beremiz.h"\n' + data)
 # first section contains programs
 for line in ListGroup[0]:
 # Split and Maps each field to dictionnary entries
 attrs = dict(
-zip(ProgramsListAttributeName, line.strip().split(';')))
+list(zip(ProgramsListAttributeName, line.strip().split(';'))))
 # Truncate "C_path" to remove conf an resources names
 attrs["C_path"] = '__'.join(
 attrs["C_path"].split(".", 2)[1:])
 # Push this dictionnary into result.
 self._ProgramList.append(attrs)
 config_FBs = {}
 Idx = 0
 for line in ListGroup[1]:
 # Split and Maps each field to dictionnary entries
 attrs = dict(
-zip(VariablesListAttributeName, line.strip().split(';')))
+list(zip(VariablesListAttributeName, line.strip().split(';'))))
 # Truncate "C_path" to remove conf an resources names
 parts = attrs["C_path"].split(".", 2)
 if len(parts) > 2:
 config_FB = config_FBs.get(tuple(parts[:2]))
 if config_FB:
 Use confnodes layout given in LocationCFilesAndCFLAGS to
 generate glue code that dispatch calls to all confnodes
 """
 # filter location that are related to code that will be called
 # in retreive, publish, init, cleanup
-locstrs = map(lambda x: "_".join(map(str, x)),
+locstrs = ["_".join(map(str, x)) for x in [loc for loc, _Cfiles, DoCalls in
-[loc for loc, _Cfiles, DoCalls in
+self.LocationCFilesAndCFLAGS if loc and DoCalls]]
-self.LocationCFilesAndCFLAGS if loc and DoCalls])
 # Generate main, based on template
 if not self.BeremizRoot.getDisable_Extensions():
 plc_main_code = targets.GetCode("plc_main_head.c") % {
 "calls_prototypes": "\n".join([(
 "void __retrieve_%(s)s(void);\n" +
 "void __publish_%(s)s(void);") % {'s': locstr} for locstr in locstrs]),
 "retrieve_calls": "\n    ".join([
 "__retrieve_%s();" % locstr for locstr in locstrs]),
 "publish_calls": "\n    ".join([  # Call publish in reverse order
-"__publish_%s();" % locstrs[i - 1] for i in xrange(len(locstrs), 0, -1)]),
+"__publish_%s();" % locstrs[i - 1] for i in range(len(locstrs), 0, -1)]),
 "init_calls": "\n    ".join([
 "init_level=%d; " % (i + 1) +
 "if((res = __init_%s(argc,argv))){" % locstr +
 # "printf(\"%s\"); "%locstr + #for debug
 "return res;}" for i, locstr in enumerate(locstrs)]),
 "cleanup_calls": "\n    ".join([
 "if(init_level >= %d) " % i +
-"__cleanup_%s();" % locstrs[i - 1] for i in xrange(len(locstrs), 0, -1)])
+"__cleanup_%s();" % locstrs[i - 1] for i in range(len(locstrs), 0, -1)])
 }
 else:
 plc_main_code = targets.GetCode("plc_main_head.c") % {
 "calls_prototypes": "\n",
 "retrieve_calls":   "\n",
 for extension, edit_name, edit_class in features.file_editors
 if extension == file_extension])
 if editor_name == "":
 if len(editors) == 1:
-editor_name = editors.keys()[0]
+editor_name = list(editors.keys())[0]
 elif len(editors) > 0:
-names = editors.keys()
+names = list(editors.keys())
 dialog = wx.SingleChoiceDialog(
 self.AppFrame,
 _("Select an editor:"),
 _("Editor selection"),
 names,
 self._IECCodeView = None
 if self._IECRawCodeView == view:
 self._IECRawCodeView = None
 if self._ProjectFilesView == view:
 self._ProjectFilesView = None
-if view in self._FileEditors.values():
+if view in list(self._FileEditors.values()):
 self._FileEditors.pop(view.GetFilePath())
 def _Clean(self):
 self._CloseView(self._IECCodeView)
 if os.path.isdir(os.path.join(self._getBuildPath())):
 status = PlcStatus.Disconnected
 if self.previous_plcstate != status:
 allmethods = self.DefaultMethods.copy()
 allmethods.update(
 self.MethodsFromStatus.get(status, {}))
-for method, active in allmethods.items():
+for method, active in list(allmethods.items()):
 self.ShowMethod(method, active)
 self.previous_plcstate = status
 if self.AppFrame is not None:
 updated = True
 self.AppFrame.RefreshStatusToolBar()
 if len(Traces) > 0:
 for debug_tick, debug_buff in Traces:
 debug_vars = UnpackDebugBuffer(
 debug_buff, self.TracedIECTypes)
 if debug_vars is not None:
-for IECPath, values_buffer, value in izip(
+for IECPath, values_buffer, value in zip(
 self.TracedIECPath,
 self.DebugValuesBuffers,
 debug_vars):
 IECdebug_data = self.IECdebug_datas.get(
 IECPath, None)
 self.LastComplainDebugToken = self.DebugToken
 buffers, self.DebugValuesBuffers = (self.DebugValuesBuffers,
-[list() for dummy in xrange(len(self.TracedIECPath))])
+[list() for dummy in range(len(self.TracedIECPath))])
 ticks, self.DebugTicks = self.DebugTicks, []
 return debug_status, ticks, buffers
 Idxs = []
 self.TracedIECPath = []
 self.TracedIECTypes = []
 if self._connector is not None and self.debug_status != PlcStatus.Broken:
 IECPathsToPop = []
-for IECPath, data_tuple in self.IECdebug_datas.iteritems():
+for IECPath, data_tuple in self.IECdebug_datas.items():
 WeakCallableDict, _data_log, _status, fvalue, _buffer_list = data_tuple
 if len(WeakCallableDict) == 0:
 # Callable Dict is empty.
 # This variable is not needed anymore!
 IECPathsToPop.append(IECPath)
 for IECPathToPop in IECPathsToPop:
 self.IECdebug_datas.pop(IECPathToPop)
 if Idxs:
 Idxs.sort()
-IdxsT = zip(*Idxs)
+IdxsT = list(zip(*Idxs))
 self.TracedIECPath = IdxsT[3]
 self.TracedIECTypes = IdxsT[1]
-res = self._connector.SetTraceVariablesList(zip(*IdxsT[0:3]))
+res = self._connector.SetTraceVariablesList(list(zip(*IdxsT[0:3])))
 if res is not None and res > 0:
 self.DebugToken = res
 else:
 self.DebugToken = None
 self.logger.write_warning(
 if len(IECdebug_data[0]) == 0:
 self.IECdebug_datas.pop(IECPath)
 else:
 IECdebug_data[4] = reduce(
 lambda x, y: x | y,
-IECdebug_data[0].itervalues(),
+iter(IECdebug_data[0].values()),
 False)
 self.AppendDebugUpdate()
 def UnsubscribeAllDebugIECVariable(self):
 def CallWeakcallables(self, IECPath, function_name, *cargs):
 data_tuple = self.IECdebug_datas.get(IECPath, None)
 if data_tuple is not None:
 WeakCallableDict, _data_log, _status, _fvalue, buffer_list = data_tuple
 # data_log.append((debug_tick, value))
-for weakcallable, buffer_list in WeakCallableDict.iteritems():
+for weakcallable, buffer_list in WeakCallableDict.items():
 function = getattr(weakcallable, function_name, None)
 if function is not None:
 # FIXME: apparently, despite of weak ref objects,
 # some dead C/C++ wx object are still reachable from here
 # leading to RuntimeError exception

branch	python3
changeset 3750	f62625418bff
parent 3747	1db10e9df882
child 3752	9f6f46dbe3ae