Try to kill Salome application when a YACS Launcher job is killed

[modules/kernel.git] / src / KERNEL_PY / salome_pynode.py

diff --git a/src/KERNEL_PY/salome_pynode.py b/src/KERNEL_PY/salome_pynode.py
index 0a8182b9f2a75acbd8a6d592b9cd85ae30706bf1..b1936d883c6f4b98829ddf7f589efc1e1515588b 100644 (file)
--- a/src/KERNEL_PY/salome_pynode.py
+++ b/src/KERNEL_PY/salome_pynode.py
@@ -1,34 +1,31 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
 #
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License.
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
 #
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  File   : salome_pynode.py
 #  Author : Christian CAREMOLI, EDF
 #  Module : SALOME
 #  $Header$
 #
-
 """
  When imported this module adds to CORBA proxy (from PyNode type) automatic pickle and unpickle
  of arguments and results when calling execute method. It also converts the SALOME exception into a standard python
- exception 
+ exception
 """
 import omniORB
 import cPickle
@@ -56,6 +53,22 @@ class SmartPyNode(Engines._objref_PyNode):
       return self.execute(name,*args,**kws)
     return afunc
 
+class SmartPyScriptNode(Engines._objref_PyScriptNode):
+  def __init__(self):
+    Engines._objref_PyScriptNode.__init__(self)
+
+  def execute(self,outargsname,*args,**kws):
+    #the tuple args are ignored
+    try:
+      args=cPickle.dumps(((),kws),-1)
+      results=Engines._objref_PyScriptNode.execute(self,outargsname,args)
+      x=cPickle.loads(results)
+      return x
+    except SALOME.SALOME_Exception, e:
+      raise ValueError(e.details.text)
+
 #Register the new proxy for PyNode
 omniORB.registerObjref(Engines._objref_PyNode._NP_RepositoryId, SmartPyNode)
+#Register the new proxy for PyScriptNode
+omniORB.registerObjref(Engines._objref_PyScriptNode._NP_RepositoryId, SmartPyScriptNode)