X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=convert%2Fconvert_ini.py;h=9f6ded8d895e0b75620779c07a078e7ddd226c63;hb=217a9ce2f303b098ad28d282bb0df2dfeeeed3c2;hp=811bc6a5b3021470e784160bfcb6cced07fdb52c;hpb=243fbe08b8fbc49d4ae0a5374069e9133b7b4b31;p=tools%2Feficas.git

diff --git a/convert/convert_ini.py b/convert/convert_ini.py
index 811bc6a5..9f6ded8d 100644
--- a/convert/convert_ini.py
+++ b/convert/convert_ini.py
@@ -1,22 +1,22 @@
-#            CONFIGURATION MANAGEMENT OF EDF VERSION
-# ======================================================================
-# COPYRIGHT (C) 1991 - 2002  EDF R&D                  WWW.CODE-ASTER.ORG
-# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY
-# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY
-# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR
-# (AT YOUR OPTION) ANY LATER VERSION.
+# -*- coding: utf-8 -*-
+# Copyright (C) 2007-2013   EDF R&D
 #
-# THIS PROGRAM 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
-# GENERAL PUBLIC LICENSE FOR MORE DETAILS.
+# 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.
 #
-# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE
-# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER,
-#    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
+# 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
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-# ======================================================================
 """
     Ce module contient le plugin convertisseur de fichier
     au format ini pour EFICAS.
@@ -31,6 +31,9 @@ import traceback
 
 from ConfigParser import ConfigParser
 from Noyau import N_CR
+from Extensions.i18n import tr
+from Extensions.eficas_exception import EficasException
+
 
 def entryPoint():
    """
@@ -54,10 +57,8 @@ class IniParser(ConfigParser):
 
        Ses caractéristiques principales sont exposées dans 2 attributs 
        de classe :
-
-       - extensions : qui donne une liste d'extensions de fichier préconisées
-
-       - formats : qui donne une liste de formats de sortie supportés
+         - extensions : qui donne une liste d'extensions de fichier préconisées
+         - formats : qui donne une liste de formats de sortie supportés
    """
    # Les extensions de fichier préconisées
    extensions=('.ini','.conf')
@@ -76,16 +77,17 @@ class IniParser(ConfigParser):
    def readfile(self,filename):
       try:
          self.read(filename)
-      except Exception,e:
-         self.cr.fatal(str(e))
+      except Exception as e:
+         self.cr.fatal(tr("lecture du fichier impossible :")+str(e))
 
-   def convert(self,outformat):
+   def convert(self,outformat,appli=None):
       if outformat == 'eval':
          return self.getdicttext()
       elif outformat == 'dict':
          return self.getdict()
       else:
-         raise "Format de sortie : %s, non supporté"
+        raise Exception("Format de sortie : %s, non supporte", outformat)
+
 
    def getdicttext(self):
       s='{'