travail sur monPlusieurs

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

diff --git a/Noyau/N_CO.py b/Noyau/N_CO.py
index 3a11de726eca41f02a85aec88efb5d4a419cd095..b868a34150c0ed17f5fb2f7b8c2d2e3b605b3651 100644 (file)
--- a/Noyau/N_CO.py
+++ b/Noyau/N_CO.py
@@ -1,25 +1,22 @@
-#@ MODIF N_CO Noyau  DATE 16/05/2007   AUTEUR COURTOIS M.COURTOIS 
 # -*- coding: iso-8859-1 -*-
-#            CONFIGURATION MANAGEMENT OF EDF VERSION
-# ======================================================================
-# COPYRIGHT (C) 1991 - 2002  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.                                 
+# Copyright (C) 2007-2013   EDF R&D
 #
-# 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.                            
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-# 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.      
-#                                                                       
-#                                                                       
-# ======================================================================
-
 
 from N_ASSD import ASSD
 from N_Exception import AsException
@@ -30,7 +27,8 @@ from asojb import AsBase
 
 class CO(ASSD, AsBase):
    def __init__(self,nom):
-      ASSD.__init__(self,etape=None,sd=None,reg='oui')
+      ASSD.__init__(self, etape=None, sd=None, reg='oui')
+      self._as_co = 1
       #
       #  On demande le nommage du concept
       #
@@ -44,10 +42,7 @@ class CO(ASSD, AsBase):
          self.nom=nom
 
    def __convert__(cls,valeur):
-         if hasattr(valeur,'_etape') :
-            # valeur est un concept CO qui a ete transforme par type_sdprod
-            if valeur.etape == valeur._etape:
-               # le concept est bien produit par l'etape
-               return valeur
+         if valeur.is_typco():
+             return valeur
          raise ValError("Pas un concept CO")
    __convert__=classmethod(__convert__)