From a98e9a7b9466e2fb0fb23382ea822eca0ea0375a Mon Sep 17 00:00:00 2001 From: "pascale.noyret" Date: Mon, 29 Mar 2021 12:21:32 +0200 Subject: [PATCH] reiindent Validation --- Validation/V_AU_MOINS_UN.py | 4 ++-- Validation/V_AU_PLUS_UN.py | 4 ++-- Validation/V_A_CLASSER.py | 8 ++++---- Validation/V_ENSEMBLE.py | 4 ++-- Validation/V_ETAPE.py | 10 +++++----- Validation/V_EXCLUS.py | 4 ++-- Validation/V_MCCOMPO.py | 4 ++-- Validation/V_MCLIST.py | 4 ++-- Validation/V_MCSIMP.py | 22 +++++++++++----------- Validation/V_MEME_NOMBRE.py | 4 ++-- Validation/V_PRESENT_ABSENT.py | 2 +- Validation/V_PRESENT_PRESENT.py | 4 ++-- Validation/V_PROC_ETAPE.py | 6 +++--- Validation/V_UN_PARMI.py | 4 ++-- Validation/__init__.py | 4 ++-- 15 files changed, 44 insertions(+), 44 deletions(-) diff --git a/Validation/V_AU_MOINS_UN.py b/Validation/V_AU_MOINS_UN.py index f923d94c..eb6d98c8 100644 --- a/Validation/V_AU_MOINS_UN.py +++ b/Validation/V_AU_MOINS_UN.py @@ -21,8 +21,8 @@ from __future__ import absolute_import -try : - from builtins import object +try : + from builtins import object except : pass class AU_MOINS_UN(object): diff --git a/Validation/V_AU_PLUS_UN.py b/Validation/V_AU_PLUS_UN.py index 4ce96d53..e197d5ab 100644 --- a/Validation/V_AU_PLUS_UN.py +++ b/Validation/V_AU_PLUS_UN.py @@ -19,8 +19,8 @@ from __future__ import absolute_import -try : - from builtins import object +try : + from builtins import object except : pass class AU_PLUS_UN(object): diff --git a/Validation/V_A_CLASSER.py b/Validation/V_A_CLASSER.py index 5c6bc8e9..51f1ab15 100644 --- a/Validation/V_A_CLASSER.py +++ b/Validation/V_A_CLASSER.py @@ -24,10 +24,10 @@ from __future__ import print_function from __future__ import absolute_import try : - from builtins import str - from builtins import object -except : - pass + from builtins import str + from builtins import object +except : + pass class A_CLASSER(object): diff --git a/Validation/V_ENSEMBLE.py b/Validation/V_ENSEMBLE.py index 2120ad0c..b8dd83fc 100644 --- a/Validation/V_ENSEMBLE.py +++ b/Validation/V_ENSEMBLE.py @@ -21,8 +21,8 @@ from __future__ import absolute_import -try : - from builtins import object +try : + from builtins import object except : pass class ENSEMBLE(object): diff --git a/Validation/V_ETAPE.py b/Validation/V_ETAPE.py index 73af04f7..6c3b38e6 100644 --- a/Validation/V_ETAPE.py +++ b/Validation/V_ETAPE.py @@ -125,11 +125,11 @@ class ETAPE(V_MCCOMPO.MCCOMPO): valid = self.validChild() valid = valid * self.validRegles(cr) if cr == 'oui' : - if not hasattr(self,'cr') : - from Noyau.N_CR import CR - self.cr=CR() - else : - self.cr.purge() + if not hasattr(self,'cr') : + from Noyau.N_CR import CR + self.cr=CR() + else : + self.cr.purge() if self.reste_val != {}: if cr == 'oui': self.cr.fatal( diff --git a/Validation/V_EXCLUS.py b/Validation/V_EXCLUS.py index 79431fe1..6e8850b0 100644 --- a/Validation/V_EXCLUS.py +++ b/Validation/V_EXCLUS.py @@ -21,8 +21,8 @@ from __future__ import absolute_import -try : - from builtins import object +try : + from builtins import object except : pass class EXCLUS(object): diff --git a/Validation/V_MCCOMPO.py b/Validation/V_MCCOMPO.py index d1cc1113..b0c948bd 100644 --- a/Validation/V_MCCOMPO.py +++ b/Validation/V_MCCOMPO.py @@ -28,8 +28,8 @@ from __future__ import print_function # Modules Python from __future__ import absolute_import try : - from builtins import str - from builtins import object + from builtins import str + from builtins import object except : pass import os diff --git a/Validation/V_MCLIST.py b/Validation/V_MCLIST.py index ec5b2d98..971583b7 100644 --- a/Validation/V_MCLIST.py +++ b/Validation/V_MCLIST.py @@ -31,8 +31,8 @@ # Modules Python from __future__ import print_function from __future__ import absolute_import -try : - from builtins import object +try : + from builtins import object except : pass import traceback diff --git a/Validation/V_MCSIMP.py b/Validation/V_MCSIMP.py index 2aef6ee2..73e81f58 100644 --- a/Validation/V_MCSIMP.py +++ b/Validation/V_MCSIMP.py @@ -30,8 +30,8 @@ # Modules Python from __future__ import absolute_import try : - from builtins import str - from builtins import object + from builtins import str + from builtins import object except : pass import traceback @@ -113,10 +113,10 @@ class MCSIMP(object): # Ajout PN # Pour tenir compte des Tuples if hasattr(self.definition.type[0],'ntuple') : - try : - if (not (type(lval[0]) is tuple)) and (not (type(lval[0]) is list)) : lval=(lval,) - except : - pass + try : + if (not (type(lval[0]) is tuple)) and (not (type(lval[0]) is list)) : lval=(lval,) + except : + pass if lval is None: valid = 0 if cr == 'oui': @@ -132,11 +132,11 @@ class MCSIMP(object): typeProto = self.typeProto intoProto = self.intoProto cardProto = self.cardProto - if self.definition.filtre != None: - listePossibles=self.getUserAssdPossible() - self.intoProto = IntoProtocol( - "into", into=listePossibles, val_min=self.definition.val_min, val_max=self.definition.val_max) - intoProto = self.intoProto + if self.definition.filtre != None: + listePossibles=self.getUserAssdPossible() + self.intoProto = IntoProtocol( + "into", into=listePossibles, val_min=self.definition.val_min, val_max=self.definition.val_max) + intoProto = self.intoProto if cr == 'oui': # un cr est demande : on collecte tous les types d'erreur try: diff --git a/Validation/V_MEME_NOMBRE.py b/Validation/V_MEME_NOMBRE.py index 9431bf2f..0ebc0621 100644 --- a/Validation/V_MEME_NOMBRE.py +++ b/Validation/V_MEME_NOMBRE.py @@ -19,8 +19,8 @@ from __future__ import absolute_import -try : - from builtins import object +try : + from builtins import object except : pass class MEME_NOMBRE(object): diff --git a/Validation/V_PRESENT_ABSENT.py b/Validation/V_PRESENT_ABSENT.py index 59a93bca..8da4115d 100644 --- a/Validation/V_PRESENT_ABSENT.py +++ b/Validation/V_PRESENT_ABSENT.py @@ -22,7 +22,7 @@ from __future__ import absolute_import try : - from builtins import object + from builtins import object except : pass class PRESENT_ABSENT(object): diff --git a/Validation/V_PRESENT_PRESENT.py b/Validation/V_PRESENT_PRESENT.py index 15378634..b2d1f927 100644 --- a/Validation/V_PRESENT_PRESENT.py +++ b/Validation/V_PRESENT_PRESENT.py @@ -21,8 +21,8 @@ from __future__ import absolute_import -try : - from builtins import object +try : + from builtins import object except : pass class PRESENT_PRESENT(object): diff --git a/Validation/V_PROC_ETAPE.py b/Validation/V_PROC_ETAPE.py index 1a1e836a..51994dfd 100644 --- a/Validation/V_PROC_ETAPE.py +++ b/Validation/V_PROC_ETAPE.py @@ -66,9 +66,9 @@ class PROC_ETAPE(V_ETAPE.ETAPE): valid = self.validChild() valid = valid * self.validRegles(cr) if self.reste_val != {}: - if not hasattr(self,'cr') : - from Noyau.N_CR import CR - self.cr=CR() + if not hasattr(self,'cr') : + from Noyau.N_CR import CR + self.cr=CR() if cr == 'oui': self.cr.fatal( tr("unknown keywords : %s") % ','.join(list(self.reste_val.keys()))) diff --git a/Validation/V_UN_PARMI.py b/Validation/V_UN_PARMI.py index dda549f1..d4fc58b8 100644 --- a/Validation/V_UN_PARMI.py +++ b/Validation/V_UN_PARMI.py @@ -21,8 +21,8 @@ from __future__ import absolute_import -try : - from builtins import object +try : + from builtins import object except : pass class UN_PARMI(object): diff --git a/Validation/__init__.py b/Validation/__init__.py index 7b9eef3b..c4fdc7d9 100644 --- a/Validation/__init__.py +++ b/Validation/__init__.py @@ -18,8 +18,8 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # """ - Ce package contient la fonctionnalité de validation des objets de type OBJECT. + Ce package contient la fonctionnalité de validation des objets de type OBJECT. Cette fonctionnalité est implémentée sous la forme de classes de type MIXIN qui - doivent etre combinées aux classes de bases de Noyau par héritage multiple dans + doivent etre combinées aux classes de bases de Noyau par héritage multiple dans un troisième package, en général, Accas. """ -- 2.39.2