TypeInstance and basestring

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

diff --git a/Validation/V_MCBLOC.py b/Validation/V_MCBLOC.py
index 5607daba3e35da427167125104cb26445c028140..5741e579cf9c38a0f4ff91902f99cffe068b8e42 100644 (file)
--- a/Validation/V_MCBLOC.py
+++ b/Validation/V_MCBLOC.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
@@ -43,7 +43,7 @@ class MCBLOC(V_MCCOMPO.MCCOMPO):
 
     txt_nat = u"Bloc :"
 
-    def isvalid(self, sd='oui', cr='non'):
+    def isValid(self, sd='oui', cr='non'):
         """
            Methode pour verifier la validite du MCBLOC. Cette methode
            peut etre appelee selon plusieurs modes en fonction de la valeur
@@ -60,13 +60,13 @@ class MCBLOC(V_MCCOMPO.MCCOMPO):
                 old_valid = self.valid
             else:
                 old_valid = None
-            for child in self.mc_liste:
-                if not child.isvalid():
+            for child in self.mcListe:
+                if not child.isValid():
                     valid = 0
                     break
             # Apres avoir verifie la validite de tous les sous-objets, on verifie
             # la validite des regles
-            text_erreurs, test_regles = self.verif_regles()
+            text_erreurs, test_regles = self.verifRegles()
             if not test_regles:
                 if cr == 'oui':
                     self.cr.fatal( "Regle(s) non respectee(s) : %s" % text_erreurs)
@@ -74,5 +74,5 @@ class MCBLOC(V_MCCOMPO.MCCOMPO):
             self.valid = valid
             self.state = 'unchanged'
             if not old_valid or old_valid != self.valid:
-                self.init_modif_up()
+                self.initModifUp()
             return self.valid