X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=Traducteur%2FdictErreurs.py;h=b3b20fb7f505b40c7bf0a2117a34719710e88e4f;hb=217a9ce2f303b098ad28d282bb0df2dfeeeed3c2;hp=086da0ec3325f874d698997ce24bfd29f8f76fe5;hpb=cdd358f4041f957701ac10d86766a85baaef4f78;p=tools%2Feficas.git diff --git a/Traducteur/dictErreurs.py b/Traducteur/dictErreurs.py index 086da0ec..b3b20fb7 100644 --- a/Traducteur/dictErreurs.py +++ b/Traducteur/dictErreurs.py @@ -1,9 +1,25 @@ # -*- coding: utf-8 -*- +# Copyright (C) 2007-2013 EDF R&D +# +# 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. +# +# 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 +# import logging -import sets - -jdcSet=sets.Set() +from Traducteur.load import jdcSet def EcritErreur(listeGena,ligne=None) : @@ -37,10 +53,13 @@ def GenereErreurPourCommande(jdc,listeCommande) : commands= jdc.root.childNodes[:] commands.reverse() for c in commands: - jdcSet.add(c.name) - for Mot in listeCommande : - if c.name != Mot :continue - EcritErreur((Mot,),c.lineno) + if type(listeCommande)==list: + for Mot in listeCommande : + if c.name != Mot :continue + EcritErreur((Mot,),c.lineno) + else: + if c.name != listeCommande :continue + EcritErreur((listeCommande,),c.lineno) def GenereErreurMotCleInFact(jdc,command,fact,mocle): for c in jdc.root.childNodes: @@ -88,4 +107,4 @@ def GenereErreurValeurDsMCF(jdc,command,fact,mocle,list_valeur): for valeur in list_valeur: trouve=texte.find(valeur) if trouve > -1 : - logging.warning("%s doit etre supprimee ou modifiee dans %s : ligne %d",valeur,c.name,n.lineno) + logging.warning("%s doit etre supprimee ou modifiee dans %s : ligne %d",valeur,c.name,n.lineno)