From 4dc7869720d0ecb2460d8f6b3a6134a11eeb8105 Mon Sep 17 00:00:00 2001 From: PASCALE NOYRET Date: Fri, 8 Dec 2023 09:56:25 +0100 Subject: [PATCH] nettoyage Validation --- Validation/V_AU_MOINS_UN.py | 9 +-------- Validation/V_AU_PLUS_UN.py | 9 +-------- Validation/V_A_CLASSER.py | 11 ++--------- Validation/V_ENSEMBLE.py | 7 ------- Validation/V_ETAPE.py | 4 +--- Validation/V_EXCLUS.py | 9 +-------- Validation/V_JDC.py | 3 +-- Validation/V_MACRO_ETAPE.py | 5 +---- Validation/V_MCBLOC.py | 4 +--- Validation/V_MCCOMPO.py | 11 ++--------- Validation/V_MCFACT.py | 4 +--- Validation/V_MCLIST.py | 8 +------- Validation/V_MCSIMP.py | 8 +------- Validation/V_MEME_NOMBRE.py | 9 +-------- Validation/V_PRESENT_ABSENT.py | 9 +-------- Validation/V_PRESENT_PRESENT.py | 9 +-------- Validation/V_PROC_ETAPE.py | 5 +---- Validation/V_UN_PARMI.py | 8 +------- Validation/__init__.py | 2 +- 19 files changed, 20 insertions(+), 114 deletions(-) diff --git a/Validation/V_AU_MOINS_UN.py b/Validation/V_AU_MOINS_UN.py index 31f48bb0..bc43c083 100644 --- a/Validation/V_AU_MOINS_UN.py +++ b/Validation/V_AU_MOINS_UN.py @@ -1,7 +1,6 @@ # coding=utf-8 -# person_in_charge: mathieu.courtois at edf.fr # ====================================================================== -# COPYRIGHT (C) 2007-2021 EDF R&D +# COPYRIGHT (C) 2007-2024 EDF R&D # 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 @@ -19,12 +18,6 @@ # # ====================================================================== - -from __future__ import absolute_import -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 2bb1f303..b44c2e5f 100644 --- a/Validation/V_AU_PLUS_UN.py +++ b/Validation/V_AU_PLUS_UN.py @@ -1,7 +1,6 @@ # coding=utf-8 -# person_in_charge: mathieu.courtois at edf.fr # ====================================================================== -# COPYRIGHT (C) 2007-2021 EDF R&D +# COPYRIGHT (C) 2007-2024 EDF R&D # 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 @@ -17,12 +16,6 @@ # 1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE. # ====================================================================== - -from __future__ import absolute_import -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 5f417fc4..b3259a78 100644 --- a/Validation/V_A_CLASSER.py +++ b/Validation/V_A_CLASSER.py @@ -1,7 +1,6 @@ # coding=utf-8 -# person_in_charge: mathieu.courtois at edf.fr # ====================================================================== -# COPYRIGHT (C) 2007-2021 EDF R&D +# COPYRIGHT (C) 2007-2024 EDF R&D # 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 @@ -21,13 +20,7 @@ -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 class A_CLASSER(object): diff --git a/Validation/V_ENSEMBLE.py b/Validation/V_ENSEMBLE.py index b8dd83fc..27c5d642 100644 --- a/Validation/V_ENSEMBLE.py +++ b/Validation/V_ENSEMBLE.py @@ -1,5 +1,4 @@ # coding=utf-8 -# person_in_charge: mathieu.courtois at edf.fr # ====================================================================== # COPYRIGHT (C) 1991 - 2017 EDF R&D WWW.CODE-ASTER.ORG # THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY @@ -19,12 +18,6 @@ # # ====================================================================== - -from __future__ import absolute_import -try : - from builtins import object -except : pass - class ENSEMBLE(object): """ diff --git a/Validation/V_ETAPE.py b/Validation/V_ETAPE.py index 2d3d2b52..acfc91bb 100644 --- a/Validation/V_ETAPE.py +++ b/Validation/V_ETAPE.py @@ -1,6 +1,6 @@ # coding=utf-8 # ====================================================================== -# COPYRIGHT (C) 2007-2021 EDF R&D +# COPYRIGHT (C) 2007-2024 EDF R&D # 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 @@ -27,8 +27,6 @@ Une classe mixin porte principalement des traitements et est utilisee par heritage multiple pour composer les traitements. """ -from __future__ import print_function -from __future__ import absolute_import # Modules Python import types diff --git a/Validation/V_EXCLUS.py b/Validation/V_EXCLUS.py index ba1d6fc6..52ca8ffb 100644 --- a/Validation/V_EXCLUS.py +++ b/Validation/V_EXCLUS.py @@ -1,7 +1,6 @@ # coding=utf-8 -# person_in_charge: mathieu.courtois at edf.fr # ====================================================================== -# COPYRIGHT (C) 2007-2021 EDF R&D +# COPYRIGHT (C) 2007-2024 EDF R&D # 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 @@ -19,12 +18,6 @@ # # ====================================================================== - -from __future__ import absolute_import -try : - from builtins import object -except : pass - class EXCLUS(object): """ diff --git a/Validation/V_JDC.py b/Validation/V_JDC.py index 23bfa89f..7a5e0b9d 100644 --- a/Validation/V_JDC.py +++ b/Validation/V_JDC.py @@ -1,7 +1,6 @@ # coding=utf-8 -# person_in_charge: mathieu.courtois at edf.fr # ====================================================================== -# COPYRIGHT (C) 2007-2021 EDF R&D +# COPYRIGHT (C) 2007-2024 EDF R&D # 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 diff --git a/Validation/V_MACRO_ETAPE.py b/Validation/V_MACRO_ETAPE.py index 7b8e0a9e..e5a49c91 100644 --- a/Validation/V_MACRO_ETAPE.py +++ b/Validation/V_MACRO_ETAPE.py @@ -1,7 +1,6 @@ # coding=utf-8 -# person_in_charge: mathieu.courtois at edf.fr # ====================================================================== -# COPYRIGHT (C) 2007-2021 EDF R&D +# COPYRIGHT (C) 2007-2024 EDF R&D # 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 @@ -28,8 +27,6 @@ Une classe mixin porte principalement des traitements et est utilisee par heritage multiple pour composer les traitements. """ -from __future__ import print_function -from __future__ import absolute_import # Modules Python import types import sys diff --git a/Validation/V_MCBLOC.py b/Validation/V_MCBLOC.py index dad07df4..d01811ef 100644 --- a/Validation/V_MCBLOC.py +++ b/Validation/V_MCBLOC.py @@ -1,7 +1,6 @@ # coding=utf-8 -# person_in_charge: mathieu.courtois at edf.fr # ====================================================================== -# COPYRIGHT (C) 2007-2021 EDF R&D +# COPYRIGHT (C) 2007-2024 EDF R&D # 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 @@ -28,7 +27,6 @@ Une classe mixin porte principalement des traitements et est utilisee par heritage multiple pour composer les traitements. """ -from __future__ import absolute_import # Modules EFICAS from . import V_MCCOMPO diff --git a/Validation/V_MCCOMPO.py b/Validation/V_MCCOMPO.py index 7653734e..dbde394c 100644 --- a/Validation/V_MCCOMPO.py +++ b/Validation/V_MCCOMPO.py @@ -1,7 +1,6 @@ # coding=utf-8 -# person_in_charge: mathieu.courtois at edf.fr # ====================================================================== -# COPYRIGHT (C) 2007-2021 EDF R&D +# COPYRIGHT (C) 2007-2024 EDF R&D # 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 @@ -24,13 +23,7 @@ Ce module contient la classe de base MCCOMPO qui sert a factoriser les traitements des objets composites de type OBJECT """ -from __future__ import print_function -# Modules Python -from __future__ import absolute_import -try : - from builtins import str - from builtins import object -except : pass +from builtins import str import os import traceback diff --git a/Validation/V_MCFACT.py b/Validation/V_MCFACT.py index 0567294e..992e1c80 100644 --- a/Validation/V_MCFACT.py +++ b/Validation/V_MCFACT.py @@ -1,7 +1,6 @@ # coding=utf-8 -# person_in_charge: mathieu.courtois at edf.fr # ====================================================================== -# COPYRIGHT (C) 2007-2021 EDF R&D +# COPYRIGHT (C) 2007-2024 EDF R&D # 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 @@ -28,7 +27,6 @@ Une classe mixin porte principalement des traitements et est utilisee par heritage multiple pour composer les traitements. """ -from __future__ import absolute_import # Modules EFICAS from . import V_MCCOMPO diff --git a/Validation/V_MCLIST.py b/Validation/V_MCLIST.py index 875c741d..7331fda7 100644 --- a/Validation/V_MCLIST.py +++ b/Validation/V_MCLIST.py @@ -1,7 +1,6 @@ # coding=utf-8 -# person_in_charge: mathieu.courtois at edf.fr # ====================================================================== -# COPYRIGHT (C) 2007-2021 EDF R&D +# COPYRIGHT (C) 2007-2024 EDF R&D # 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 @@ -29,11 +28,6 @@ utilisee par heritage multiple pour composer les traitements. """ # Modules Python -from __future__ import print_function -from __future__ import absolute_import -try : - from builtins import object -except : pass import traceback diff --git a/Validation/V_MCSIMP.py b/Validation/V_MCSIMP.py index 5b303ead..da4daa65 100644 --- a/Validation/V_MCSIMP.py +++ b/Validation/V_MCSIMP.py @@ -1,7 +1,6 @@ # coding=utf-8 -# person_in_charge: mathieu.courtois at edf.fr # ====================================================================== -# COPYRIGHT (C) 2007-2021 EDF R&D +# COPYRIGHT (C) 2007-2024 EDF R&D # 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 @@ -28,11 +27,6 @@ utilisee par heritage multiple pour composer les traitements. """ # Modules Python -from __future__ import absolute_import -try : - from builtins import str - from builtins import object -except : pass import traceback # Modules EFICAS diff --git a/Validation/V_MEME_NOMBRE.py b/Validation/V_MEME_NOMBRE.py index feb49dc6..dae6a88c 100644 --- a/Validation/V_MEME_NOMBRE.py +++ b/Validation/V_MEME_NOMBRE.py @@ -1,6 +1,6 @@ # coding=utf-8 # ====================================================================== -# COPYRIGHT (C) 2007-2021 EDF R&D +# COPYRIGHT (C) 2007-2024 EDF R&D # 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 @@ -15,13 +15,6 @@ # ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER, # 1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE. # ====================================================================== -# person_in_charge: mathieu.courtois at edf.fr - - -from __future__ import absolute_import -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 cf8cc210..75a9c513 100644 --- a/Validation/V_PRESENT_ABSENT.py +++ b/Validation/V_PRESENT_ABSENT.py @@ -1,7 +1,6 @@ # coding=utf-8 -# person_in_charge: mathieu.courtois at edf.fr # ====================================================================== -# COPYRIGHT (C) 2007-2021 EDF R&D +# COPYRIGHT (C) 2007-2024 EDF R&D # 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 @@ -19,12 +18,6 @@ # # ====================================================================== - -from __future__ import absolute_import -try : - 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 fe839d9e..ec9df4f9 100644 --- a/Validation/V_PRESENT_PRESENT.py +++ b/Validation/V_PRESENT_PRESENT.py @@ -1,7 +1,6 @@ # coding=utf-8 -# person_in_charge: mathieu.courtois at edf.fr # ====================================================================== -# COPYRIGHT (C) 2007-2021 EDF R&D +# COPYRIGHT (C) 2007-2024 EDF R&D # 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 @@ -19,12 +18,6 @@ # # ====================================================================== - -from __future__ import absolute_import -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 63e55b76..07a66c7e 100644 --- a/Validation/V_PROC_ETAPE.py +++ b/Validation/V_PROC_ETAPE.py @@ -1,7 +1,6 @@ # coding=utf-8 -# person_in_charge: mathieu.courtois at edf.fr # ====================================================================== -# COPYRIGHT (C) 2007-2021 EDF R&D +# COPYRIGHT (C) 2007-2024 EDF R&D # 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 @@ -25,8 +24,6 @@ Une classe mixin porte principalement des traitements et est utilisee par heritage multiple pour composer les traitements. """ -from __future__ import print_function -from __future__ import absolute_import # Modules EFICAS from . import V_ETAPE from Noyau.N_Exception import AsException diff --git a/Validation/V_UN_PARMI.py b/Validation/V_UN_PARMI.py index 2b7780e5..a9f51303 100644 --- a/Validation/V_UN_PARMI.py +++ b/Validation/V_UN_PARMI.py @@ -1,7 +1,6 @@ # coding=utf-8 -# person_in_charge: mathieu.courtois at edf.fr # ====================================================================== -# COPYRIGHT (C) 2007-2021 EDF R&D +# COPYRIGHT (C) 2007-2024 EDF R&D # 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 @@ -20,11 +19,6 @@ # ====================================================================== -from __future__ import absolute_import -try : - from builtins import object -except : pass - class UN_PARMI(object): """ diff --git a/Validation/__init__.py b/Validation/__init__.py index b743c777..4d4c89c0 100644 --- a/Validation/__init__.py +++ b/Validation/__init__.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2021 EDF R&D +# Copyright (C) 2007-2024 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public -- 2.39.2