CCAR: import_hook.py was too strict in ensure_list (ImportError raised)

[modules/kernel.git] / src / Container / SALOME_PyNode.py

diff --git a/src/Container/SALOME_PyNode.py b/src/Container/SALOME_PyNode.py
index f02d54f361cc752fd2bafc0a72a6462a15552ebf..d0f8f527390ff443043991c8a419c984a8257cd1 100644 (file)
--- a/src/Container/SALOME_PyNode.py
+++ b/src/Container/SALOME_PyNode.py
@@ -48,17 +48,19 @@ class Generic(SALOME__POA.GenericObj):
 
 class PyNode_i (Engines__POA.PyNode,Generic):
   """The implementation of the PyNode CORBA IDL"""
-  def __init__(self, nodeName,code,poa):
+  def __init__(self, nodeName,code,poa,my_container):
     """Initialize the node : compilation in the local context"""
     Generic.__init__(self,poa)
     self.nodeName=nodeName
     self.code=code
+    self.my_container=my_container._container
     linecache.cache[nodeName]=0,None,string.split(code,'\n'),nodeName
     ccode=compile(code,nodeName,'exec')
     self.context={}
+    self.context["my_container"] = self.my_container
     exec ccode in self.context
 
-  def execute(self,funcName,argsin): 
+  def execute(self,funcName,argsin):
     """Execute the function funcName found in local context with pickled args (argsin)"""
     try:
       argsin,kws=cPickle.loads(argsin)
@@ -71,3 +73,33 @@ class PyNode_i (Engines__POA.PyNode,Generic):
       l=traceback.format_exception(exc_typ,exc_val,exc_fr)
       raise SALOME.SALOME_Exception(SALOME.ExceptionStruct(SALOME.BAD_PARAM,"".join(l),"PyNode: %s, function: %s" % (self.nodeName,funcName),0))
 
+class PyScriptNode_i (Engines__POA.PyScriptNode,Generic):
+  """The implementation of the PyScriptNode CORBA IDL that executes a script"""
+  def __init__(self, nodeName,code,poa,my_container):
+    """Initialize the node : compilation in the local context"""
+    Generic.__init__(self,poa)
+    self.nodeName=nodeName
+    self.code=code
+    self.my_container=my_container._container
+    linecache.cache[nodeName]=0,None,string.split(code,'\n'),nodeName
+    self.ccode=compile(code,nodeName,'exec')
+    self.context={}
+    self.context["my_container"] = self.my_container
+
+  def execute(self,outargsname,argsin):
+    """Execute the script stored in attribute ccode with pickled args (argsin)"""
+    try:
+      argsname,kws=cPickle.loads(argsin)
+      self.context.update(kws)
+      exec self.ccode in self.context
+      argsout=[]
+      for arg in outargsname:
+        if not self.context.has_key(arg):
+          raise KeyError("There is no variable %s in context" % arg)
+        argsout.append(self.context[arg])
+      argsout=cPickle.dumps(tuple(argsout),-1)
+      return argsout
+    except:
+      exc_typ,exc_val,exc_fr=sys.exc_info()
+      l=traceback.format_exception(exc_typ,exc_val,exc_fr)
+      raise SALOME.SALOME_Exception(SALOME.ExceptionStruct(SALOME.BAD_PARAM,"".join(l),"PyScriptNode: %s, outargsname: %s" % (self.nodeName,outargsname),0))