TypeInstance and basestring

[tools/eficas.git] / Validation / V_PROC_ETAPE.py

diff --git a/Validation/V_PROC_ETAPE.py b/Validation/V_PROC_ETAPE.py
index db880ffda9a13b79f0e3e7fbf3672e330e9a2409..edd5b1388e773a894cc0b6cd6b91aa9cc17a6e42 100644 (file)
--- a/Validation/V_PROC_ETAPE.py
+++ b/Validation/V_PROC_ETAPE.py
@@ -1,7 +1,7 @@
 # coding=utf-8
 # person_in_charge: mathieu.courtois at edf.fr
 # ======================================================================
-# COPYRIGHT (C) 1991 - 2015  EDF R&D                  WWW.CODE-ASTER.ORG
+# COPYRIGHT (C) 1991 - 2017  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
@@ -37,11 +37,11 @@ from Extensions.i18n import tr
 class PROC_ETAPE(V_ETAPE.ETAPE):
 
     """
-       On reutilise les methodes report,verif_regles
+       On reutilise les methodes report,verifRegles
        de ETAPE par heritage.
     """
 
-    def isvalid(self, sd='oui', cr='non'):
+    def isValid(self, sd='oui', cr='non'):
         """
            Methode pour verifier la validite de l'objet PROC_ETAPE. Cette methode
            peut etre appelee selon plusieurs modes en fonction de la valeur
@@ -58,16 +58,16 @@ class PROC_ETAPE(V_ETAPE.ETAPE):
             - propager l'eventuel changement d'etat au parent
         """
         if CONTEXT.debug:
-            print(("ETAPE.isvalid ", self.nom))
+            print(("ETAPE.isValid ", self.nom))
         if self.state == 'unchanged':
             return self.valid
         else:
-            valid = self.valid_child()
-            valid = valid * self.valid_regles(cr)
+            valid = self.validChild()
+            valid = valid * self.validRegles(cr)
             if self.reste_val != {}:
                 if cr == 'oui':
                     self.cr.fatal(
                         tr("unknown keywords : %s") % ','.join(list(self.reste_val.keys())))
                 valid = 0
-            self.set_valid(valid)
+            self.setValid(valid)
             return self.valid