Correcting comments or execution error behaviour

diff --git a/src/daComposant/daCore/Aidsm.py b/src/daComposant/daCore/Aidsm.py
index 8cf264817ef65f7b52f7a1a7953008a667344aa4..472bcb38f461b2cfee7cd2c0f349a090c6117dbd 100644 (file)
--- a/src/daComposant/daCore/Aidsm.py
+++ b/src/daComposant/daCore/Aidsm.py
@@ -869,13 +869,13 @@ class Aidsm(object):
         "Lancement du calcul"
         self.__case.register("execute",dir(),locals(),None,True)
         Operator.CM.clearCache()
-        #~ try:
-        if   Executor == "YACS": self.__executeYACSScheme( SaveCaseInFile )
-        else:                    self.__executePythonScheme( SaveCaseInFile )
-        #~ except Exception as e:
-            #~ if isinstance(e, SyntaxError): msg = "at %s: %s"%(e.offset, e.text)
-            #~ else: msg = ""
-            #~ raise ValueError("during execution, the following error occurs:\n\n%s %s\n\nSee also the potential messages, which can show the origin of the above error, in the launching terminal.\n"%(str(e),msg))
+        try:
+            if   Executor == "YACS": self.__executeYACSScheme( SaveCaseInFile )
+            else:                    self.__executePythonScheme( SaveCaseInFile )
+        except Exception as e:
+            if isinstance(e, SyntaxError): msg = "at %s: %s"%(e.offset, e.text)
+            else: msg = ""
+            raise ValueError("during execution, the following error occurs:\n\n%s %s\n\nSee also the potential messages, which can show the origin of the above error, in the launching terminal.\n"%(str(e),msg))
         return 0
 
     def __executePythonScheme(self, FileName=None):
@@ -928,8 +928,8 @@ class Aidsm(object):
                 if self.__adaoObject['AlgorithmParameters'].hasObserver( k ):
                     self.__adaoObject['AlgorithmParameters'].removeObserver( k, "", True )
                 self.__StoredInputs[k] = self.__adaoObject['AlgorithmParameters'].pop(k, None)
-        del self.__adaoObject # Because it breaks pickle in Python 2
-        del self.__case       # Because it breaks pickle in Python 2
+        del self.__adaoObject # Because it breaks pickle in Python 2. Not required for Python 3
+        del self.__case       # Because it breaks pickle in Python 2. Not required for Python 3
         return 0
 
 # ==============================================================================

diff --git a/src/daEficas/configuration_ADAO.py b/src/daEficas/configuration_ADAO.py
index 7d6862db2bec09b2635ab7618b528eb900ea1489..132d373cc2eff37c1722686419dee7b8005b369e 100644 (file)
--- a/src/daEficas/configuration_ADAO.py
+++ b/src/daEficas/configuration_ADAO.py
@@ -58,6 +58,7 @@ class CONFIG(configuration.CONFIG_BASE):
     # (code, version, catalogue, formatIn, formatOut)
     # Il faut les mettre dans un tuple
     self.catalogues = (("ADAO", "V0", os.path.join(self.rep_ini, 'ADAO_Cata_V0.py'), "adao"),)
+# JPA 21/09/2017 : self.catalogues = (("ADAO", "V0", os.path.join(self.rep_ini, 'ADAO_Cata_V0.py'), "python", "adao"),)
 
 def make_config(appli,rep):
 

diff --git a/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py b/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py
index 3ae14f12acfa54dd702f0cbe206ee25ec4e3e929..7e37a7485c35324c843d9afdce2127440e5e6d23 100644 (file)
--- a/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py
+++ b/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py
@@ -57,7 +57,7 @@ class AdaoEficasWrapper(eficasSalome.MyEficas):
       # self.menubar.hide()
       # self.toolBar.hide()
       # self.frameEntete.close()
-      self.closeEntete()
+      # self.closeEntete()
 
     def addJdcInSalome(self, jdcPath):
       debug("addJdcInSalome is called " + str(jdcPath))