- Patch pour les changements sur EficasV1

- Changement dans les entêtes des fichiers Python

diff --git a/src/daEficas/configuration_ADAO.py b/src/daEficas/configuration_ADAO.py
index a5a30c303dba3cc07cc8587d0196fbeb0780332b..7a27a1d0e1f86c4357a9d3d42f21ec4bb0d477fc 100644 (file)
--- a/src/daEficas/configuration_ADAO.py
+++ b/src/daEficas/configuration_ADAO.py
@@ -26,9 +26,9 @@ class CONFIG:
     self.convert_module = "convert_adao"
 
     # Format des catalogues...
-    # (code,version,catalogue,formatIn) et  ,formatOut) ?
-    self.catalogues = []
-    self.catalogues.append(["ADAO", "V0", os.path.join(self.rep_ini, 'ADAO_Cata_V0.py'), "adao"])
+    # (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"),)
 
 def make_config(appli,rep):
 

diff --git a/src/daSalome/daGUI/ADAOGUI.py b/src/daSalome/daGUI/ADAOGUI.py
index 39d5a7b9d3ca2d74abf1e2f3c7d738b95afd4930..0c7b9f1ada09204fed863010609539a45aed40d4 100644 (file)
--- a/src/daSalome/daGUI/ADAOGUI.py
+++ b/src/daSalome/daGUI/ADAOGUI.py
@@ -1,4 +1,4 @@
-# -*- coding: iso-8859-1 -*-
+# -*- coding: utf-8 -*-
 #  Copyright (C) 2010  EDF R&D
 #
 #  This library is free software; you can redistribute it and/or

diff --git a/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py b/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py
index 87ca6e957c28d9e7481aafa830b2497f63dda593..b57935b4b5aa81fc0acfd1ee8db11cfb62c0e9fd 100644 (file)
--- a/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py
+++ b/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py
@@ -1,4 +1,4 @@
-# -*- coding: iso-8859-1 -*-
+# -*- coding: utf-8 -*-
 #  Copyright (C) 2010 EDF R&D
 #
 #  This library is free software; you can redistribute it and/or

diff --git a/src/daSalome/daGUI/daGuiImpl/ADAOGUI_impl.py b/src/daSalome/daGUI/daGuiImpl/ADAOGUI_impl.py
index 7e708e737a3cfe80b334d5d57bb98a6c2f5d76fc..0c6446f2a1440976b3375d20593f3788368a029e 100644 (file)
--- a/src/daSalome/daGUI/daGuiImpl/ADAOGUI_impl.py
+++ b/src/daSalome/daGUI/daGuiImpl/ADAOGUI_impl.py
@@ -1,4 +1,4 @@
-# -*- coding: iso-8859-1 -*-
+# -*- coding: utf-8 -*-
 #  Copyright (C) 2010 EDF R&D
 #
 #  This library is free software; you can redistribute it and/or

diff --git a/src/daSalome/daGUI/daGuiImpl/adaoCase.py b/src/daSalome/daGUI/daGuiImpl/adaoCase.py
index ddb1b8d945d8c755b3a3da50661eb73eec6d43ef..02885670fdf01037f95576efbbb326bbe454cfc5 100644 (file)
--- a/src/daSalome/daGUI/daGuiImpl/adaoCase.py
+++ b/src/daSalome/daGUI/daGuiImpl/adaoCase.py
@@ -1,4 +1,4 @@
-# -*- coding: iso-8859-1 -*-
+# -*- coding: utf-8 -*-
 #  Copyright (C) 2010 EDF R&D
 #
 #  This library is free software; you can redistribute it and/or

diff --git a/src/daSalome/daGUI/daGuiImpl/adaoGuiHelper.py b/src/daSalome/daGUI/daGuiImpl/adaoGuiHelper.py
index d973e8480c91ed1bfd70fd211dc746e0a60b65ac..a0429539aef32f3724318c710a99994fb23efb05 100644 (file)
--- a/src/daSalome/daGUI/daGuiImpl/adaoGuiHelper.py
+++ b/src/daSalome/daGUI/daGuiImpl/adaoGuiHelper.py
@@ -1,4 +1,4 @@
-# -*- coding: iso-8859-1 -*-
+# -*- coding: utf-8 -*-
 #  Copyright (C) 2010 EDF R&D
 #
 #  This library is free software; you can redistribute it and/or

diff --git a/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py b/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py
index fdff4297fcd0b7198904c817ac5b0cf89251ce37..31cd89959e2a92e7139b2caff0264a01e36086e8 100644 (file)
--- a/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py
+++ b/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py
@@ -1,4 +1,4 @@
-# -*- coding: iso-8859-1 -*-
+# -*- coding: utf-8 -*-
 #  Copyright (C) 2010 EDF R&D
 #
 #  This library is free software; you can redistribute it and/or

diff --git a/src/daSalome/daGUI/daGuiImpl/adaoModuleHelper.py b/src/daSalome/daGUI/daGuiImpl/adaoModuleHelper.py
index 1336a471e32a23340c6bf86efb15b2329d471217..9a38b9abb67d095ce9d030c2009200adf25cf830 100644 (file)
--- a/src/daSalome/daGUI/daGuiImpl/adaoModuleHelper.py
+++ b/src/daSalome/daGUI/daGuiImpl/adaoModuleHelper.py
@@ -1,4 +1,4 @@
-# -*- coding: iso-8859-1 -*-
+# -*- coding: utf-8 -*-
 #  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,

diff --git a/src/daSalome/daGUI/daGuiImpl/adaoStudyEditor.py b/src/daSalome/daGUI/daGuiImpl/adaoStudyEditor.py
index 9d29837bba7e9a36f6d59c947d445d3f66d319be..acf16f7b36e4b349638d41d8355cd0d9d8fe216a 100644 (file)
--- a/src/daSalome/daGUI/daGuiImpl/adaoStudyEditor.py
+++ b/src/daSalome/daGUI/daGuiImpl/adaoStudyEditor.py
@@ -1,4 +1,4 @@
-# -*- coding: iso-8859-1 -*-
+# -*- coding: utf-8 -*-
 #  Copyright (C) 2010 EDF R&D
 #
 #  This library is free software; you can redistribute it and/or

diff --git a/src/daSalome/daGUI/daGuiImpl/enumerate.py b/src/daSalome/daGUI/daGuiImpl/enumerate.py
index 35bfdf6e11a3fa383367bf5371f119ea031755b2..6584778b4677e32d65844be8ba05acff52dabf53 100644 (file)
--- a/src/daSalome/daGUI/daGuiImpl/enumerate.py
+++ b/src/daSalome/daGUI/daGuiImpl/enumerate.py
@@ -1,4 +1,4 @@
-# -*- coding: iso-8859-1 -*-
+# -*- coding: utf-8 -*-
 #  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,

diff --git a/src/daSalome/daYacsIntegration/daOptimizerLoop.py b/src/daSalome/daYacsIntegration/daOptimizerLoop.py
index 65ce9ee37c086b62efda4d6cebc97ae6318a94bf..43014a28f246b6e330b6a63dd8691bff976624d6 100644 (file)
--- a/src/daSalome/daYacsIntegration/daOptimizerLoop.py
+++ b/src/daSalome/daYacsIntegration/daOptimizerLoop.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+#-*- coding: utf-8 -*-
 
 import SALOMERuntime
 import pickle

diff --git a/src/daSalome/daYacsIntegration/daStudy.py b/src/daSalome/daYacsIntegration/daStudy.py
index 745ca259cdea9bddab072a0695c69cd406449603..ed685c0cd1ead81d5cfbe761aa7e7015bdd75ae3 100644 (file)
--- a/src/daSalome/daYacsIntegration/daStudy.py
+++ b/src/daSalome/daYacsIntegration/daStudy.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+#-*- coding: utf-8 -*-
 
 from daCore.AssimilationStudy import AssimilationStudy
 

diff --git a/src/daSalome/daYacsSchemaCreator/help_methods.py b/src/daSalome/daYacsSchemaCreator/help_methods.py
index eecd291bef093768fed589242f6fb3dd1b48c0f1..530fc4747af25cc44d9132f4739f66c7f10e9643 100644 (file)
--- a/src/daSalome/daYacsSchemaCreator/help_methods.py
+++ b/src/daSalome/daYacsSchemaCreator/help_methods.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+#-*- coding: utf-8 -*-
 #  Copyright (C) 2010 EDF R&D
 #
 #  This library is free software; you can redistribute it and/or

diff --git a/src/daSalome/daYacsSchemaCreator/infos_daComposant.py b/src/daSalome/daYacsSchemaCreator/infos_daComposant.py
index 5253e4ca1e8dbdc806025724e2dc1d96fbfc005b..76cb3794e7ee1dab79acb3abdb9630dfee56169d 100644 (file)
--- a/src/daSalome/daYacsSchemaCreator/infos_daComposant.py
+++ b/src/daSalome/daYacsSchemaCreator/infos_daComposant.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+#-*- coding: utf-8 -*-
 #  Copyright (C) 2010 EDF R&D
 #
 #  This library is free software; you can redistribute it and/or

diff --git a/src/daSalome/daYacsSchemaCreator/methods.py b/src/daSalome/daYacsSchemaCreator/methods.py
index 5f5b9674429749bdab975d81e2483e26e621dcce..661d0dde75647308cca9ddf97c6a22f5edee807f 100644 (file)
--- a/src/daSalome/daYacsSchemaCreator/methods.py
+++ b/src/daSalome/daYacsSchemaCreator/methods.py
@@ -1,4 +1,4 @@
-#-*-coding:iso-8859-1-*-
+#-*- coding: utf-8 -*-
 #  Copyright (C) 2010 EDF R&D
 #
 #  This library is free software; you can redistribute it and/or

diff --git a/src/daSalome/daYacsSchemaCreator/run.py b/src/daSalome/daYacsSchemaCreator/run.py
index e76189299bd756e46410df971489cd713f694e50..2cc865ef88fce6dee2319cdcc3ce987bed869fa9 100644 (file)
--- a/src/daSalome/daYacsSchemaCreator/run.py
+++ b/src/daSalome/daYacsSchemaCreator/run.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-#-*-coding:iso-8859-1-*-
+#-*- coding: utf-8 -*-
 #  Copyright (C) 2008-2009  EDF R&D
 #
 #  This library is free software; you can redistribute it and/or