on evite six quand c est possible

diff --git a/Editeur/Objecttreeitem.py b/Editeur/Objecttreeitem.py
index dd7d41f96a0f9ad8294ef81fa47de8a6859a7f98..b0b6641a6357a9070fe02e71f3e3551c82a97b02 100644 (file)
--- a/Editeur/Objecttreeitem.py
+++ b/Editeur/Objecttreeitem.py
@@ -24,12 +24,10 @@ from __future__ import absolute_import
 from __future__ import print_function
 try :
    from builtins import str
-   from builtins import range
    from builtins import object
 except :
    pass
 import types,os,glob,imp,sys
-from six.moves.reprlib import Repr
 from copy import copy,deepcopy
 
 # import du chargeur de composants
@@ -37,8 +35,11 @@ from .comploader import makeObjecttreeitem
 from Ihm import CONNECTOR
 from Extensions.i18n import tr
 from Extensions.eficas_exception import EficasException
-from six.moves import range
 
+try :
+   from repr import Repr
+except :
+   from reprlib import Repr
 myrepr = Repr()
 myrepr.maxstring = 100
 myrepr.maxother = 100
@@ -403,10 +404,6 @@ class ObjectTreeItem(TreeItem,Delegate):
             self.setFunction(value)
         except:
             pass
-# Modif de ma part CCar : je ne comprend pas a quoi ca sert
-# ca parait meme incorrect
-      #  else:
-      #      self.object = value
 
     def isExpandable(self):
         return 1

diff --git a/Editeur/listePatrons.py b/Editeur/listePatrons.py
index f1cf08b4f056cdf77c3f1cefce0c50cf86381934..2a3057369164c4cd0516a18cc320476655230c13 100644 (file)
--- a/Editeur/listePatrons.py
+++ b/Editeur/listePatrons.py
@@ -18,12 +18,10 @@
 #
 from __future__ import absolute_import
 try :
-   from builtins import range
    from builtins import object
 except : pass
 import os
 import re
-from six.moves import range
 
 sous_menus={
 #          "OPENTURNS_STUDY" : {0:{"Essai":"Std.comm"}},

diff --git a/Editeur/session.py b/Editeur/session.py
index 3050dfb571021d0ae8bc54f552b578b641ee6260..500680015203bd95e599ef4151c12daef7792f0a 100644 (file)
--- a/Editeur/session.py
+++ b/Editeur/session.py
@@ -198,7 +198,13 @@ def checkFich(option, opt_str, fich, parser):
     if not hasattr(parser.values,"studies"):
        parser.values.studies=[]
        parser.values.comm=[]
-    config = six.moves.configparser.configparser()
+   # Python 2 to 3
+    try :
+     import ConfigParser
+     config=ConfigParser.ConfigParser()
+    except :
+     import configparser
+     config=configparser.configparser()
     config.read([fich])
     if not config.has_option(u"jdc","jdc"):
        raise OptionValueError(tr(" jdc %s manque option jdc dans section jdc", str(fich)))

diff --git a/Ihm/I_A_CLASSER.py b/Ihm/I_A_CLASSER.py
index aa46e11716d2921264baf71b3ca1d48a0b644f74..389869c44850ab63f9f29860631b7953a02f340e 100644 (file)
--- a/Ihm/I_A_CLASSER.py
+++ b/Ihm/I_A_CLASSER.py
@@ -23,7 +23,6 @@
 from __future__ import absolute_import
 
 from . import I_REGLE
-import six
 
 class A_CLASSER(I_REGLE.REGLE):
   def getText(self):
@@ -36,5 +35,5 @@ class A_CLASSER(I_REGLE.REGLE):
     for arg in self.args1:
       t=t+arg.strip()+' ou '
     text = text + t[0:-4] +'\n'
-    return six.text_type(text)
+    return text
 

diff --git a/Ihm/I_ENTITE.py b/Ihm/I_ENTITE.py
index 48e9fb77b78ccd86b9bc38b7be43f3c1f5e5e4e4..f29bda01d77836de95c300b1c1b6dfc3f6751a24 100644 (file)
--- a/Ihm/I_ENTITE.py
+++ b/Ihm/I_ENTITE.py
@@ -18,7 +18,6 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 from __future__ import absolute_import
-import six
 _no=0
 
 import Accas

diff --git a/Ihm/I_ETAPE.py b/Ihm/I_ETAPE.py
index 9eee3e6f7be270a47ab4b3723a3fbfa8096c08cb..23d66f8b44b6f6070a4ed676681d27d1dac8d695 100644 (file)
--- a/Ihm/I_ETAPE.py
+++ b/Ihm/I_ETAPE.py
@@ -297,6 +297,7 @@ class ETAPE(I_MCCOMPO.MCCOMPO):
             Une procedure n'en a aucun
             Une macro en a en general plus d'un
       """
+      self.deleteRef()
       #print "supprimeSdProds",self
       if self.reuse is self.sd :return
       # l'etape n'est pas reentrante

diff --git a/Ihm/I_JDC.py b/Ihm/I_JDC.py
index d2e3ac4e6c5719ac0e669dd8fa19cba12947b464..71e3cb70f0ecaf853e2604eaca028fbe2f1fd0fd 100644 (file)
--- a/Ihm/I_JDC.py
+++ b/Ihm/I_JDC.py
@@ -75,6 +75,7 @@ class JDC(I_OBJECT.OBJECT):
       
       l=[]
       for k,v in d.items():
+        print (k,v)
         #if type(v) != types.InstanceType and not isinstance(v,object): continue
         if  not isinstance(v,object): continue
         # On considere que seul assd indique un type quelconque pas CO
@@ -919,10 +920,11 @@ class JDC(I_OBJECT.OBJECT):
          o=self.sdsDict.get(sdnom,None)
 
       if isinstance(o,ASSD):
-         raise AsException(tr(" Nom de concept deja  defini : "+ sdnom))
+         raise AsException(tr(" Nom de concept deja defini : "+ sdnom))
 
       # ATTENTION : Il ne faut pas ajouter sd dans sds car il s y trouve deja.
       # Ajoute a la creation (appel de regSD).
+      #print (' je pass ici, pour ', sdnom, self.sdsDict)
       self.sdsDict[sdnom]=sd
       sd.nom=sdnom
 

diff --git a/Ihm/I_MACRO_ETAPE.py b/Ihm/I_MACRO_ETAPE.py
index 10639e4816895ae2f899da9bb979edded5b7eae5..7cea87cfb99bc66e27c2baf540988e0c6b3b972d 100644 (file)
--- a/Ihm/I_MACRO_ETAPE.py
+++ b/Ihm/I_MACRO_ETAPE.py
@@ -42,8 +42,6 @@ import Noyau, Validation.V_MACRO_ETAPE
 from Noyau import N_Exception
 from Noyau.N_Exception import AsException
 import Accas # attention aux imports circulaires
-import six
-from six.moves import range
 # fin import a resorber
 
 class MACRO_ETAPE(I_ETAPE.ETAPE):
@@ -171,7 +169,7 @@ class MACRO_ETAPE(I_ETAPE.ETAPE):
        #print ("valid ",j.isValid())
        CONTEXT.unsetCurrentStep()
        CONTEXT.setCurrentStep(step)
-       raise EficasException(tr("Impossible de relire le fichier %s \n ")+ six.text_type(j.cr))
+       raise EficasException(tr("Impossible de relire le fichier %s \n ")+ str(j.cr))
 
 
     if not j.isValid() and doitEtreValide:

diff --git a/Ihm/I_MCSIMP.py b/Ihm/I_MCSIMP.py
index f1f50be51a53f85090e54792e42f2af15a45557f..749ac5fe2f6bec141ba3435bcf05f6274b3366d9 100644 (file)
--- a/Ihm/I_MCSIMP.py
+++ b/Ihm/I_MCSIMP.py
@@ -23,11 +23,6 @@ import traceback
 from copy import copy
 from Extensions.i18n import tr
 from Extensions.eficas_exception import EficasException
-#from six.moves import range
-#from six.moves.reprlib import Repr
-#myrepr = Repr()
-#myrepr.maxstring = 100
-#myrepr.maxother = 100
 
 from Noyau.N_utils import repr_float
 import Validation
@@ -492,7 +487,7 @@ class MCSIMP(I_OBJECT.OBJECT):
         Met a jour la valeur du mot cle simple suite au remplacement 
         du concept old_sd
     """
-    print "replaceConcept",old_sd,sd
+    print ("replaceConcept",old_sd,sd)
     if type(self.valeur) == tuple :
       if old_sd in self.valeur:
         self.initModif()
@@ -581,10 +576,12 @@ class MCSIMP(I_OBJECT.OBJECT):
              self.finModif()
  
   def renommeSdCree(self,nouveauNom):
-      print ( self.jdc.sdsDict, self.valeur)
+      #print ( 'dans renommeSdCree', self.jdc.sdsDict, self.valeur)
       if nouveauNom in self.jdc.sdsDict : return (0, 'concept deja existant')
-      self.valeur.renomme(nouveauNom)
+      if self.valeur == None : return (0, 'pb sur la valeur')
+      else :   self.valeur.renomme(nouveauNom)
       return (1, 'concept renomme')
+      
 
 
   def getMinMax(self):
@@ -740,6 +737,7 @@ class MCSIMP(I_OBJECT.OBJECT):
     CONNECTOR.Emit(self,"valid")
 
   def deleteRef(self):
+    print ('je suis dans deleteRef', self.nom)
     if self.definition.creeDesObjets :
        if self.valeur : 
           self.valeur.deleteReference() 

diff --git a/Ihm/I_OBJECT.py b/Ihm/I_OBJECT.py
index 0280a0e3777f3f185a74b13d041c9a906fca8beb..7d1dde898ff1dda0fc946e845585e920e5f30f85 100644 (file)
--- a/Ihm/I_OBJECT.py
+++ b/Ihm/I_OBJECT.py
@@ -180,7 +180,7 @@ class OBJECT:
       #return 1, tr("Nommage du concept effectue")
 
   def deleteRef(self):
-  # doit etre surcharge dans MC_COMPO et MC_SIMP
+  # doit etre surcharge dans MC_COMPO et MC_SIMP 
       pass
 
 

diff --git a/Ihm/I_PROC_ETAPE.py b/Ihm/I_PROC_ETAPE.py
index 35f55d51b99988507c9546cc3b423587a1360cd3..4b46b5921159600f29b87cd4718f005aff02b55c 100644 (file)
--- a/Ihm/I_PROC_ETAPE.py
+++ b/Ihm/I_PROC_ETAPE.py
@@ -58,10 +58,6 @@ class PROC_ETAPE(I_ETAPE.ETAPE):
           Inputs :
              - sd=concept detruit
       """
-      print ('iiiiiiiiiiiiiiiiiiiii')
-      print (self)
-      import traceback
-      traceback.print_stack()
       for child in self.mcListe :
         child.deleteConcept(sd)
 

diff --git a/InterfaceQT4/configuration.py b/InterfaceQT4/configuration.py
index 5b3d59c241e06c9fcb7fad7f4f567efb74277374..c3d438146009f170ee02944c49b443a19ca86c04 100644 (file)
--- a/InterfaceQT4/configuration.py
+++ b/InterfaceQT4/configuration.py
@@ -186,7 +186,7 @@ class configBase(object):
            QMessageBox.critical( None, tr("Import du fichier de Configuration"), 
                        tr("Erreur a la lecture du fichier de configuration %s " , str(fic_ini_integrateur)))
          except : 
-           print("Erreur a la lecture du fichier de configuration %s " , str(fic_ini_integrateur))
+           print("Erreur a la lecture du fichier de configuration %s " , str(fic_ini_integrateur))
          return
       self.labels_eficas.append('rep_aide')
       for k in self.labels_eficas :

diff --git a/InterfaceQT4/monWidgetCreeUserAssd.py b/InterfaceQT4/monWidgetCreeUserAssd.py
index 9d05785303e6a533f40c27682a362ef1122b4e53..0da1ab7ffd9a98470759a19aae7d790f7814b90b 100644 (file)
--- a/InterfaceQT4/monWidgetCreeUserAssd.py
+++ b/InterfaceQT4/monWidgetCreeUserAssd.py
@@ -41,9 +41,9 @@ class MonWidgetCreeUserAssd ( MonWidgetSimpTxt):
       valeurEntree = str(self.lineEditVal.text())
       if valeurEntree == self.oldValeurTexte : return
       if self.oldValeurTexte == ""  : enCreation = True
-      else                           : enCreation = False
+      else                          : enCreation = False
       if enCreation : validite,commentaire=self.objSimp.creeUserASSDetSetValeur(valeurEntree)
-      else           : validite,commentaire=self.objSimp.renommeSdCree(valeurEntree)
+      else          : validite,commentaire=self.objSimp.renommeSdCree(valeurEntree)
       if not enCreation : self.node.updateNodeTexte()
       #PNPNPN -- signal update sur les fils ou ?
       if commentaire != "" :
@@ -53,6 +53,7 @@ class MonWidgetCreeUserAssd ( MonWidgetSimpTxt):
          else  : 
             self.editor.afficheInfos(commentaire,Qt.red)
             self.lineEditVal.setText("")
+            self.oldValeurTexte=""
       
        
       

diff --git a/Noyau/N_ASSD.py b/Noyau/N_ASSD.py
index cf1185f7b88f32d02c23dc2de00b47ebc033c670..a8cb9ac9c93dba96ff7812ea68aa3a80a6856f7d 100644 (file)
--- a/Noyau/N_ASSD.py
+++ b/Noyau/N_ASSD.py
@@ -103,7 +103,7 @@ class ASSD(object):
         return self.etape[key]
 
     def setName(self, nom):
-        """Positionne le nom de self (et appelle sd_init)
+        """Positionne le nom de self 
         """
         self.nom = nom
 

diff --git a/Noyau/N_CONVERT.py b/Noyau/N_CONVERT.py
index 4d2c317663a9bf258ae8c231f1ba6c1b6286cf24..e2f456e52a6f33a81a18030a24b6b879c5700690 100644 (file)
--- a/Noyau/N_CONVERT.py
+++ b/Noyau/N_CONVERT.py
@@ -109,7 +109,7 @@ class UserASSDConversion(TypeConversion):
 
     def function(self, o):
         #import traceback
-        #print ('je convertis : ', o, 'en ', self.typeACreer )
+        print ('je convertis : ', o, 'en ', self.typeACreer )
         #traceback.print_stack()
         if o == None : return None
         nouvelObj=self.typeACreer(o)

diff --git a/Noyau/N_MACRO_ETAPE.py b/Noyau/N_MACRO_ETAPE.py
index 5cb81706cf66e28f1cb22d04a316ea4fae52b112..bc87ea9b07c4ccf468f9a4eccc9991898c11c743 100644 (file)
--- a/Noyau/N_MACRO_ETAPE.py
+++ b/Noyau/N_MACRO_ETAPE.py
@@ -28,7 +28,6 @@ from __future__ import absolute_import
 from __future__ import print_function
 try :
    from builtins import str
-   from builtins import range
 except : pass
 import types
 import sys
@@ -43,7 +42,6 @@ from . import N_utils
 from .N_utils import AsType
 from .N_CO import CO
 from .N_ASSD import ASSD
-from six.moves import range
 
 
 class MACRO_ETAPE(N_ETAPE.ETAPE):

diff --git a/Noyau/N_MCSIMP.py b/Noyau/N_MCSIMP.py
index 5ce0fdd8ab1febeaea09b225942c9abfd7da31af..7d08838be357a68449e809002ff60d8630b95359 100644 (file)
--- a/Noyau/N_MCSIMP.py
+++ b/Noyau/N_MCSIMP.py
@@ -113,12 +113,17 @@ class MCSIMP(N_OBJECT.OBJECT):
         self.state='changed'
         nomVal=val
         if nomVal in self.jdc.sdsDict.keys():
-           if isinstance(self.jdc.sdsDict[nomVal],self.definition.creeDesObjetsDeType): return (1, 'concept deja reference')
+           if isinstance(self.jdc.sdsDict[nomVal],self.definition.creeDesObjetsDeType): return (0, 'concept deja reference')
            else : return (0, 'concept d un autre type existe deja')
         if self.convProto:
             objVal = self.convProto.convert(nomVal)
-            # inutile le init de UserASSD fait le necessaire
-            #objVal.initialiseNom(nomVal)
+            objVal.initialiseNom(nomVal)
+            p=self.parent
+            while p in self.parent :
+                  print ('mise a jour de ',p)
+                  if has_attr(p, 'listeDesReferencesCrees') : p.listeDesReferencesCrees.append(self.objVal)
+                  else : p.listeDesReferencesCrees=(self.objVal,)
+                  p=p.parent
         return (self.setValeur(objVal), 'reference cree')
       
     def getValeur(self):

diff --git a/Noyau/N_OBJECT.py b/Noyau/N_OBJECT.py
index 1d0f2a1a9b6bbadf8dd4d660687636096fcc7f06..45891db49b0978bf526125b5ef20f082d2c6dc35 100644 (file)
--- a/Noyau/N_OBJECT.py
+++ b/Noyau/N_OBJECT.py
@@ -64,6 +64,7 @@ class OBJECT(object):
         self.jdc = None
         self.niveau = None
 
+
     def getVal(self):
         """
             Retourne la valeur de l'objet. Cette méthode fournit

diff --git a/Noyau/N_UserASSD.py b/Noyau/N_UserASSD.py
index bd47ce07a49e48772884945e52bcde9ec809ac98..3a11b9384e956cfad8719d4aa837fd5f75ca8f42 100644 (file)
--- a/Noyau/N_UserASSD.py
+++ b/Noyau/N_UserASSD.py
@@ -46,25 +46,26 @@ class UserASSD(ASSD):
        self.nom = nom
        self.jdc = CONTEXT.getCurrentJdC()
        self.parent = self.jdc
-       self.id = self.parent.regUserSD(self)
        self.initialiseValeur()
        self.utilisePar       = set()
-       self.id = self.parent.regSD(self)
+       if self.nom != 'sansNom' : self.id = self.parent.regSD(self)
+       else : self.id = None
 
 
     def initialiseNom(self,nom):
+       print ('je passe initialiseNom pour : ', self, nom)
        for (i,j)  in self.parent.sdsDict.items() :
           if j == self : 
              del(self.parent.sdsDict[i])
        self.parent.sdsDict[nom]=self
        self.nom=nom
+       if self.nom != 'sansNom' and self.id ==None : self.id = self.parent.regSD(self)
 
     def initialiseValeur(self,valeur=None):
        self.valeur=valeur
 
     def ajoutUtilisePar(self,mc):
        self.utilisePar.add(mc)
-       print ('ajoutUtilisePar', self.utilisePar)
 
     def enleveUtilisePar(self,mc):
        try : self.utilisePar.remove(mc)
@@ -80,6 +81,5 @@ class UserASSD(ASSD):
        print ('je suis dans deleteReference')
        for MC in self.utilisePar : 
            MC.valeur=None
-       
        self.parent.delConcept(self.nom)
 

diff --git a/Noyau/N_VALIDATOR.py b/Noyau/N_VALIDATOR.py
index 2e9cdc240cb3063d0b2e648976d7e7877b358871..3a946cac5042a8f7b55a93f0b4aaa8573c78cd01 100644 (file)
--- a/Noyau/N_VALIDATOR.py
+++ b/Noyau/N_VALIDATOR.py
@@ -28,7 +28,6 @@ from __future__ import absolute_import
 from __future__ import print_function
 try :
    from builtins import str
-   from builtins import range
    from builtins import object
 except : pass
    
@@ -39,8 +38,6 @@ from .N_ASSD import ASSD
 from .N_types import isInt, isFloat_or_int, isComplex, isNumber, isStr, isSequence
 from Accas import A_TUPLE
 from Extensions.i18n import tr
-import six
-from six.moves import range
 
 
 
@@ -1477,15 +1474,14 @@ class FunctionVal(Valid):
         return valeur
 
 # MC ca ne devrait plus servir !
-CoercableFuncs = {int:     int,
-                  int:    int,
-                  float:   float,
-                  complex: complex,
-                  str: six.text_type}
+# PN : commenter le 22.11.19
+#CoercableFuncs = {int:     int,
+#                  int:    int,
+#                  float:   float,
+#                  complex: complex,
+#                  str: six.text_type}
 
 
-#class FunctionValObjet(FunctionVal):
-#OOOOOOOOOOOOOOo
 
 class TypeVal(ListVal):
 

diff --git a/Noyau/N_utils.py b/Noyau/N_utils.py
index a0415268258bb0763df100ac90499c6570c2c442..c5be200cfd8b6e569b0f123ca0c70d2a13c1e903 100644 (file)
--- a/Noyau/N_utils.py
+++ b/Noyau/N_utils.py
@@ -37,7 +37,6 @@ import sys
 from .N_Exception import AsException
 from .N_types import isInt, isFloat, isComplex, isStr, isSequence, isASSD
 from .strfunc import getEncoding
-import six
 
 SEP = '_'
 
@@ -57,6 +56,7 @@ def calleeWhere(niveau=4):
         # Python 2.7 compile function does not accept unicode filename, so we encode it
         # with the current locale encoding in order to have a correct traceback.
         # Here, we convert it back to unicode.
+        import six
         filename = six.text_type(frame.f_code.co_filename, getEncoding())
         return frame.fLineNo, filename, frame.f_code.co_firstlineno, frame.f_locals
     except:

diff --git a/Noyau/nommage.py b/Noyau/nommage.py
index e8a24ee22778177210806e9f672067022b84d4ac..5966f9fd735c6f00976f98fb106974e5d2ef6f1e 100644 (file)
--- a/Noyau/nommage.py
+++ b/Noyau/nommage.py
@@ -37,7 +37,6 @@
 from __future__ import absolute_import
 try :
    from builtins import str
-   from builtins import range
 except :
    pass
 import re
@@ -48,8 +47,6 @@ from functools import partial
 # Modules EFICAS
 from . import N_utils
 from .strfunc import getEncoding
-import six
-from six.moves import range
 
 regex1 = '=?\s*%s\s*\('
 # commentaire standard precede d'un nombre quelconque de blancs (pas
@@ -81,6 +78,7 @@ def _getNomConceptResultat(ope, level=2):
     if sys.version_info >= (3,0) :
        filename = co.co_filename
     else : 
+       import six
        filename = six.text_type(co.co_filename, getEncoding())
     name = co.co_name
     # pattern pour identifier le debut de la commande

diff --git a/convert/convert_TELEMAC.py b/convert/convert_TELEMAC.py
index 084175080f92d69b4429c14d43898a38191a57f6..b77b3639fc2163285eb701234cb923c6d698bd7b 100644 (file)
--- a/convert/convert_TELEMAC.py
+++ b/convert/convert_TELEMAC.py
@@ -26,7 +26,6 @@ from Extensions.i18n import tr
 #traceback.print_stack()
 
 from convert.convert_python import Pythonparser
-from six.moves import range
 try:
   basestring
 except NameError:

diff --git a/convert/parseur_python.py b/convert/parseur_python.py
index fb7fe91c82d9df0326b74ffbb389914a0b05a647..c577c58e25cf68c5f30b1ecaa97c63ca8fe45251 100644 (file)
--- a/convert/parseur_python.py
+++ b/convert/parseur_python.py
@@ -21,14 +21,12 @@ from __future__ import absolute_import
 from __future__ import print_function
 try :
   from builtins import str
-  from builtins import range
   from builtins import object
 except :
   pass
 import sys,string,re
 import traceback
 from Extensions.i18n import tr
-from six.moves import range
 
 escapedQuotesRE = re.compile(r"(\\\\|\\\"|\\\')")
 stringsAndCommentsRE =  \