diff -r f794fbff8f02 -r 28f96aa9c070 py_ext/py_ext.py --- a/py_ext/py_ext.py Tue May 14 00:30:35 2013 +0200 +++ b/py_ext/py_ext.py Tue May 14 18:41:33 2013 +0900 @@ -8,18 +8,21 @@ def Generate_C(self, buildpath, varlist, IECCFLAGS): - plc_python_filepath = os.path.join(os.path.split(__file__)[0], "plc_python.c") + plc_python_filepath = os.path.join( + os.path.split(__file__)[0], "plc_python.c") plc_python_file = open(plc_python_filepath, 'r') plc_python_code = plc_python_file.read() plc_python_file.close() python_eval_fb_list = [] for v in varlist: - if v["vartype"] == "FB" and v["type"] in ["PYTHON_EVAL","PYTHON_POLL"]: + if v["vartype"] == "FB" and v["type"] in ["PYTHON_EVAL", + "PYTHON_POLL"]: python_eval_fb_list.append(v) python_eval_fb_count = max(1, len(python_eval_fb_list)) # prepare python code - plc_python_code = plc_python_code % { "python_eval_fb_count": python_eval_fb_count } + plc_python_code = plc_python_code % { + "python_eval_fb_count": python_eval_fb_count } Gen_Pythonfile_path = os.path.join(buildpath, "py_ext.c") pythonfile = open(Gen_Pythonfile_path,'w') @@ -33,41 +36,4 @@ def GetIconName(self): return "Pyfile" - def CTNGenerate_C(self, buildpath, locations): - current_location = self.GetCurrentLocation() - # define a unique name for the generated C file - location_str = "_".join(map(lambda x:str(x), current_location)) - - sections_code = self.GetSectionsCode() - - text = "## Code generated by Beremiz python mixin confnode\n\n" - - # Adding variables - text += "## User variables reference\n" - text += sections_code["variables"] - text += "\n" - - # Adding user global variables and routines - text += "## User internal user variables and routines\n" - text += sections_code["globals"] - text += "\n" - - # Adding Beremiz python runtime functions - text += "## Beremiz python runtime functions\n" - for section in self.SECTIONS_NAMES: - if section != "globals": - code_object = getattr(self.CodeFile, section) - text += "def _runtime_%s_%s():\n" % (location_str, section) - section_code = sections_code.get(section) - if section_code: - text += section_code - else: - text += " pass\n\n" - - runtimefile_path = os.path.join(buildpath, "runtime_%s.py"%location_str) - runtimefile = open(runtimefile_path, 'w') - runtimefile.write(text) - runtimefile.close() - - return [], "", False, ("runtime_%s.py"%location_str, file(runtimefile_path,"rb"))