Compilation under CentOS 6 and 7

[tools/medcoupling.git] / v8_work / medcoup7to8.py

diff --git a/v8_work/medcoup7to8.py b/v8_work/medcoup7to8.py
index 9e8557d07e5b8c8fac334e5652c9e2568cdf39ce..61efbe0690e44ad84725df0aa7398d869af10396 100755 (executable)
--- a/v8_work/medcoup7to8.py
+++ b/v8_work/medcoup7to8.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2015  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2020  CEA/DEN, 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
@@ -86,12 +86,12 @@ REPLACEMENTS = [("RevIntegral",  "IntensiveConservation"),
                 ("setAxType", "setAxisType"),
                 ("getAxType", "getAxisType"),
                 ("isIdentity2", "isIota"),
-                ("SWIGTYPE_p_ParaMEDMEM__MEDCouplingExtrudedMesh", "SWIGTYPE_p_ParaMEDMEM__MEDCouplingMappedExtrudedMesh"),
+                ("SWIGTYPE_p_MEDCoupling__MEDCouplingExtrudedMesh", "SWIGTYPE_p_MEDCoupling__MEDCouplingMappedExtrudedMesh"),
                 ("MEDCouplingExtrudedMesh____new___", "MEDCouplingMappedExtrudedMesh____new___"),
                 ("locateValue", "findIdFirstEqual"),
                 ("locateTuple", "findIdFirstEqualTuple"),   
-                ("ParaMEDMEM_DataArrayByte_locateTuple", "ParaMEDMEM_DataArrayByte_findIdFirstEqualTuple"),
-                ("ParaMEDMEM_DataArrayAsciiChar_locateTuple", "ParaMEDMEM_DataArrayAsciiChar_findIdFirstEqualTuple"),
+                ("MEDCoupling_DataArrayByte_locateTuple", "MEDCoupling_DataArrayByte_findIdFirstEqualTuple"),
+                ("MEDCoupling_DataArrayAsciiChar_locateTuple", "MEDCoupling_DataArrayAsciiChar_findIdFirstEqualTuple"),
                 #("substr", "subArray"),                # conflicts with regular C++ substr, to be handled manually
                 #("search", "findIdSequence"),          # idem
                 ]   
@@ -108,7 +108,7 @@ def convert(root_dir, ext, quiet):
       # Skip this script!
       if fileName == __myName:
         if not quiet:
-          print "!!! Skipping script %s !!!" % __myName
+          print("!!! Skipping script %s !!!" % __myName)
         continue
       ok = False
       if fileName[-28:] != "MEDCouplingNatureOfFieldEnum":
@@ -119,7 +119,7 @@ def convert(root_dir, ext, quiet):
       else:
         ok = True
       if not ok: continue # skip file
-      if not quiet:  print "Handling %s ..." % fileName
+      if not quiet:  print("Handling %s ..." % fileName)
       for line in fileinput.input(fileName, inplace=1, backup='.bak'):
         for before, after in REPLACEMENTS:
           line = re.sub("(\W|^)(%s)(\W|$)" % before, r"\1%s\3" % after, line.rstrip('\r\n'))