X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=module_generator%2Fastcompo.py;h=f0c6f257c50ce8322deb9191589065820c478a69;hb=8b4424caa9bc6abdcd519333a0acc9533e3d2a63;hp=03b32be2a2492224680ad5523ac007f22cd795b1;hpb=5c8ede90327c7e68cdb9a599d553778a9c32996d;p=tools%2Fyacsgen.git diff --git a/module_generator/astcompo.py b/module_generator/astcompo.py index 03b32be..f0c6f25 100644 --- a/module_generator/astcompo.py +++ b/module_generator/astcompo.py @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2016 EDF R&D +# Copyright (C) 2009-2021 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -26,15 +26,15 @@ """ import re, os, sys -from gener import Component, Invalid, makedirs +from module_generator.gener import Component, Invalid, makedirs -from pyth_tmpl import pyinitEXEService, pyinitCEXEService, pyinitService -import aster_tmpl -from aster_tmpl import asterCEXEService, asterEXEService -from aster_tmpl import asterService, asterEXECompo, asterCEXECompo, asterCompo -from aster_tmpl import comm, make_etude, cexe, exeaster -from aster_tmpl import container, component -from aster_tmpl import cmake_src_compo_aster, cmake_src_compo_aster_lib +from module_generator.pyth_tmpl import pyinitEXEService, pyinitCEXEService, pyinitService +from module_generator import aster_tmpl +from module_generator.aster_tmpl import asterCEXEService, asterEXEService +from module_generator.aster_tmpl import asterService, asterEXECompo, asterCEXECompo, asterCompo +from module_generator.aster_tmpl import comm, make_etude, cexe, exeaster +from module_generator.aster_tmpl import container, component +from module_generator.aster_tmpl import cmake_src_compo_aster, cmake_src_compo_aster_lib class ASTERComponent(Component): """ @@ -220,7 +220,7 @@ from Execution.E_SUPERV import SUPERV if typ=="file":continue #files are not passed through service interface params.append(name) if typ == "pyobj": - datas.append('"%s":cPickle.loads(%s)' % (name, name)) + datas.append('"%s":pickle.loads(%s)' % (name, name)) else: datas.append('"%s":%s' % (name, name)) #ajout de l'adresse du composant @@ -234,7 +234,7 @@ from Execution.E_SUPERV import SUPERV if typ=="file":continue #files are not passed through service interface params.append(name) if typ == "pyobj": - datas.append('cPickle.dumps(j.g_context["%s"],-1)'%name) + datas.append('pickle.dumps(j.g_context["%s"],-1)'%name) else: datas.append('j.g_context["%s"]'%name) outparams = ",".join(params) @@ -283,7 +283,7 @@ from Execution.E_SUPERV import SUPERV if typ=="file":continue #files are not passed through service interface params.append(name) if typ == "pyobj": - datas.append('"%s":cPickle.loads(%s)' % (name, name)) + datas.append('"%s":pickle.loads(%s)' % (name, name)) else: datas.append('"%s":%s' % (name, name)) #ajout de l'adresse du composant @@ -296,7 +296,7 @@ from Execution.E_SUPERV import SUPERV for name, typ in serv.outport: params.append(name) if typ == "pyobj": - datas.append('cPickle.dumps(j.g_context["%s"],-1)'%name) + datas.append('pickle.dumps(j.g_context["%s"],-1)'%name) else: datas.append('j.g_context["%s"]'%name) outparams = ",".join(params) @@ -354,7 +354,7 @@ from Execution.E_SUPERV import SUPERV if typ=="file":continue #files are not passed through service interface params.append(name) if typ == "pyobj": - datas.append('"%s":cPickle.loads(%s)' % (name, name)) + datas.append('"%s":pickle.loads(%s)' % (name, name)) else: datas.append('"%s":%s' % (name, name)) #ajout de l'adresse du composant @@ -367,7 +367,7 @@ from Execution.E_SUPERV import SUPERV for name, typ in serv.outport: params.append(name) if typ == "pyobj": - datas.append('cPickle.dumps(j.g_context["%s"],-1)'%name) + datas.append('pickle.dumps(j.g_context["%s"],-1)'%name) else: datas.append('j.g_context["%s"]'%name) outparams = ",".join(params)