travail sur monPlusieurs

[tools/eficas.git] / Noyau / N_REGLE.py

diff --git a/Noyau/N_REGLE.py b/Noyau/N_REGLE.py
index 787b45dd8a3ec75b50656b61e104194a660b37bc..a38c59d82f2f465aae475240c8807de97e09b762 100644 (file)
--- a/Noyau/N_REGLE.py
+++ b/Noyau/N_REGLE.py
@@ -1,24 +1,23 @@
-# -*- coding: utf-8 -*-
-#@ MODIF N_REGLE Noyau  DATE 27/03/2002   AUTEUR DURAND C.DURAND 
-#            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: iso-8859-1 -*-
+# 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 la classe mere pour les classes de definition des regles d exclusion.
 
@@ -58,7 +57,7 @@ class REGLE:
           s'il vaut 0, la règle n'est pas vérifiée et le texte joint contient
          un commentaire de la non validité.
       """
-      raise "NotImplemented : class REGLE should be derived"
+      raise NotImplementedError('class REGLE should be derived')
 
    def liste_to_dico(self,args):
       """
@@ -78,6 +77,6 @@ class REGLE:
           dico[arg]=0
         return dico
       else :
-        raise "Erreur ce n'est ni un dictionnaire ni une liste",args
+        raise Exception("Erreur ce n'est ni un dictionnaire ni une liste %s" % args)