Modif V6_4_°

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

diff --git a/Noyau/N__F.py b/Noyau/N__F.py
index 87fa725bce661807226f1e3c7203d222865d8f09..7878989474e951c61eee55b73286ba3e2638dd04 100644 (file)
--- a/Noyau/N__F.py
+++ b/Noyau/N__F.py
@@ -1,24 +1,24 @@
-#@ MODIF N__F Noyau  DATE 07/09/2009   AUTEUR COURTOIS M.COURTOIS 
+#@ MODIF N__F Noyau  DATE 28/06/2011   AUTEUR COURTOIS M.COURTOIS 
 # -*- coding: iso-8859-1 -*-
 # RESPONSABLE COURTOIS M.COURTOIS
 #            CONFIGURATION MANAGEMENT OF EDF VERSION
 # ======================================================================
-# COPYRIGHT (C) 1991 - 2002  EDF R&D                  WWW.CODE-ASTER.ORG
+# COPYRIGHT (C) 1991 - 2011  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.                                 
+# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR
+# (AT YOUR OPTION) ANY LATER VERSION.
+#
+# 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.
+#
+# 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 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.                            
 #
-# 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.      
-#                                                                       
-#                                                                       
 # ======================================================================
 
 
@@ -26,13 +26,16 @@ import UserDict
 
 class _F(UserDict.UserDict):
    """
-       Cette classe a un comportement semblable à un 
+       Cette classe a un comportement semblable à un
        dictionnaire Python et permet de donner
-       la valeur d'un mot-clé facteur avec pour les sous 
+       la valeur d'un mot-clé facteur avec pour les sous
        mots-clés la syntaxe motcle=valeur
    """
 
-   def __init__(self,**args):
+   def __init__(self, *pos, **args):
+      if len(pos) != 0:
+         raise SyntaxError("Valeur invalide pour '_F('. "\
+            "On attend cette syntaxe : _F(MOTCLE=valeur, ...)")
       self.data=args
 
    def supprime(self):
@@ -46,11 +49,11 @@ class _F(UserDict.UserDict):
       else:
         return cmp(self.data, dict)
 
+   def __iter__(self):
+      return iter(self.data)
+
    def copy(self):
       import copy
       c= copy.copy(self)
       c.data=self.data.copy()
       return c
-
-
-