porting to SALOME 9.3: 2to3

[modules/hydrosolver.git] / src / salome_hydro / study.py

diff --git a/src/salome_hydro/study.py b/src/salome_hydro/study.py
index 550a189ccf373e3b0d4061282b0aa64873e61955..dd066ee917baa32b40580cb4e063b3b80b0ff3d9 100644 (file)
--- a/src/salome_hydro/study.py
+++ b/src/salome_hydro/study.py
@@ -29,38 +29,19 @@ MODULE_NAME = "HYDROSOLVER"
 COMPONENT_NAME = "HydroSolver"
 COMPONENT_ICON = "HYDRO_small.png"
 
-MASCARET_FILE_TYPE = "MASCARET_EFICAS_FILE"
-MASCARET_ICON = "case1d.png"
-MASCARET_CASE_TYPE_ID = 1
-
 VARS_ICON = "icon_variables.png"
 
-LOG_ICON = "log.png"
-LOG_TYPE_ID = 2
-
-TELEMAC2D_FILE_TYPE = "TELEMAC2D_EFICAS_FILE"
-TELEMAC2D_ICON = "case2d.png"
-TELEMAC2D_CASE_TYPE_ID = 3
-
-PYTEL_FILE_TYPE = "PYTEL_EFICAS_FILE"
-PYTEL_ICON = "case_pytel.png"
-PYTEL_CASE_TYPE_ID = 5
-
-# Dictionary used to map Eficas parameters to Mascaret file types
-mascaretFileTypeDict = {"FICHIER_ABAQUES" : "abaques",
-                        "FICHIER_DICO" : "dico",
-                        "FICHIER_CASIER" : "casier",
-                        "FICHIER_GEOMETRIE" : "geo",
-                        "FICHIER_LOI" : "loi",
-                        "FICHIER_MOT_CLE" : "cas",
-                        "LISTING" : "listing",
-                        "FICHIER_DAMOCLE" : "damocle",
-                        "RESULTAT" : "res",
-                        "LISTING_CASIER" : "listing_casier",
-                        "LISTING_LIAISON" : "listing_liaison",
-                        "RESULTAT_CASIER" : "res_casier",
-                        "RESULTAT_LIAISON" : "res_liaison"
-                       }
+TELMA_FILE_TYPE = "TELMA_EFICAS_FILE"
+TELMA_ICON = "telma_file.png"
+TELMA_TYPE_ID = 1
+
+STUDY_FILE_TYPE = "STUDY_EFICAS_FILE"
+STUDY_ICON = "study_file.png"
+STUDY_TYPE_ID = 2
+
+PARAM_STUDY_FILE_TYPE = "PARAM_STUDY_EFICAS_FILE"
+PARAM_STUDY_ICON = "param_study_file.png"
+PARAM_STUDY_TYPE_ID = 3
 
 def jdc_to_dict(jdc, command_list):
     """
@@ -71,16 +52,16 @@ def jdc_to_dict(jdc, command_list):
     context = {}
     for command in command_list:
         context[command] = _args_to_dict
-    exec "parameters = " + jdc.strip() in context
+    exec("parameters = " + jdc.strip(), context)
     return context['parameters']
 
 def _args_to_dict(**kwargs):
     return kwargs
 
 def get_jdc_dict_var_as_tuple(jdc_dict, varname):
-    if not jdc_dict.has_key(varname):
+    if varname not in jdc_dict:
         return tuple()
-    elif not isinstance(jdc_dict[varname], types.TupleType):
+    elif not isinstance(jdc_dict[varname], tuple):
         return (jdc_dict[varname],)
     else:
         return jdc_dict[varname]
@@ -106,27 +87,38 @@ class HydroStudyEditor:
                                                                COMPONENT_ICON)
         return self.hydroComp
 
-    def find_or_create_mascaret_case(self, filePath):
+    def find_or_create_telma(self, filePath):
+        self.find_or_create_hydro_component()
+        itemName = os.path.splitext(os.path.basename(filePath))[0]
+        sobj = self.editor.findOrCreateItem(self.hydroComp,
+                                            name=itemName,
+                                            fileType=TELMA_FILE_TYPE,
+                                            fileName=filePath,
+                                            icon=TELMA_ICON,
+                                            comment=str(filePath),
+                                            typeId=TELMA_TYPE_ID)
+
+    def find_or_create_param_study(self, filePath):
         self.find_or_create_hydro_component()
         itemName = os.path.splitext(os.path.basename(filePath))[0]
         sobj = self.editor.findOrCreateItem(self.hydroComp,
-                                            name = itemName,
-                                            fileType = MASCARET_FILE_TYPE,
-                                            fileName = filePath,
-                                            icon = MASCARET_ICON,
-                                            comment = str(filePath),
-                                            typeId = MASCARET_CASE_TYPE_ID)
-
-    def find_or_create_telemac2d_case(self, filePath):
+                                            name=itemName,
+                                            fileType=PARAM_STUDY_FILE_TYPE,
+                                            fileName=filePath,
+                                            icon=PARAM_STUDY_ICON,
+                                            comment=str(filePath),
+                                            typeId=PARAM_STUDY_TYPE_ID)
+
+    def find_or_create_run_study(self, filePath):
         self.find_or_create_hydro_component()
         itemName = os.path.splitext(os.path.basename(filePath))[0]
         sobj = self.editor.findOrCreateItem(self.hydroComp,
-                                            name = itemName,
-                                            fileType = TELEMAC2D_FILE_TYPE,
-                                            fileName = filePath,
-                                            icon = TELEMAC2D_ICON,
-                                            comment = str(filePath),
-                                            typeId = TELEMAC2D_CASE_TYPE_ID)
+                                            name=itemName,
+                                            fileType=STUDY_FILE_TYPE,
+                                            fileName=filePath,
+                                            icon=STUDY_ICON,
+                                            comment=str(filePath),
+                                            typeId=STUDY_TYPE_ID)
 
     def generate_study_script(self, filePath):
         """
@@ -143,11 +135,11 @@ class HydroStudyEditor:
 
         # Computing name of the file (same as filePath)
         file_dir, filename = os.path.split(filePath)
-        root, sfx = os.path.splitext(filename)
-        python_file = os.path.join(file_dir,root+".py")
+        root, _ = os.path.splitext(filename)
+        python_file = os.path.join(file_dir, root+".py")
 
         # Writting to file
-        with open(python_file,'w') as pfile:
+        with open(python_file, 'w') as pfile:
             pfile.write(python_script)
 
     def generate_study_yacs(self, filePath):
@@ -165,19 +157,8 @@ class HydroStudyEditor:
 
         # Computing name of the file (same as filePath)
         file_dir, filename = os.path.split(filePath)
-        root, sfx = os.path.splitext(filename)
-        yacs_file = os.path.join(file_dir,root+".xml")
+        root, _ = os.path.splitext(filename)
+        yacs_file = os.path.join(file_dir, root+".xml")
 
         # Writting to file
         yacs_scheme.saveSchema(yacs_file)
-
-    def find_or_create_pytel_case(self, filePath):
-        self.find_or_create_hydro_component()
-        itemName = os.path.splitext(os.path.basename(filePath))[0]
-        sobj = self.editor.findOrCreateItem(self.hydroComp,
-                                            name = itemName,
-                                            fileType = PYTEL_FILE_TYPE,
-                                            fileName = filePath,
-                                            icon = PYTEL_ICON,
-                                            comment = str(filePath),
-                                            typeId = PYTEL_CASE_TYPE_ID)