2to3 changes

MuonColliderSoft · Jan 18, 2022 · b47c6a2 · b47c6a2
1 parent 0500776
commit b47c6a2
Show file tree

Hide file tree

Showing 70 changed files with 418 additions and 416 deletions.
diff --git a/ilcsoft-install b/ilcsoft-install
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 import os, sys
 import logging
-import commands
-from ilcsoft import *
+import subprocess
+# from ilcsoft import *
+import ilcsoft as ilcsoft
 
 _version = "v01-17-07"
 
@@ -51,7 +52,7 @@ if( not os.path.exists(config_file) ):
     parser.error( 'config file %s does not exist' % config_file )
 
 # some settings needed for reading nightly build cfg files
-date_iso8601 = commands.getoutput( "date +%F" )
+date_iso8601 = subprocess.getoutput( "date +%F" )
 config_file_basename = config_file[config_file.rfind( '/' )+1:config_file.rfind(".")]
 config_file_extension = config_file[config_file.rfind(".")+1:]
 
@@ -91,18 +92,18 @@ try:
         arch += "_centos7"
     ilcPath = ilcsoft_afs_path[ arch ] + '/'
     gcccheck = platform.python_compiler()
-    print gcccheck
-    print ilcPath
-    print arch
-    print gccver
+    print(gcccheck)
+    print(ilcPath)
+    print(arch)
+    print(gccver)
 except:
     pass
 
 nightlies = False
 
-print '+ Running ilcsoft-install [ %s ]' % _version
-print '+ Read configuration file [ %s ]' % config_file
-execfile( config_file )
+print('+ Running ilcsoft-install [ %s ]' % _version)
+print('+ Read configuration file [ %s ]' % config_file)
+exec(compile(open( config_file, "rb" ).read(), config_file, 'exec'))
 
 # pass the name of the config file to ilcsoft.py
 ilcsoft.config_file = config_file
@@ -125,10 +126,10 @@ if options.install :
     ilcsoft.makeinstall()
 
 
-print "&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&"
+print("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&")
 
 if options.dependencies :
    ilcsoft.showDependencies()
 
 
-print "&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&"
+print("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&")
diff --git a/ilcsoft/__init__.py b/ilcsoft/__init__.py
@@ -5,91 +5,91 @@
 #sys.path.append( sys.path[0] + '/ilcsoft/simtools' )
 #print 'DEBUG: sys.path: ' + str(sys.path)
 
-from ilcsoft import ILCSoft
+from .ilcsoft import ILCSoft
 
 # core software
-from ilcutil import ILCUTIL
-from lcio import LCIO
-from lccd import LCCD
-from gear import GEAR
-from raida import RAIDA
-from ced import CED
-from kaltest import KalTest, KalDet
-from pathfinder import PathFinder
-from bbq import BBQ
-from gbl import GBL
-from sio import SIO
+from .ilcutil import ILCUTIL
+from .lcio import LCIO
+from .lccd import LCCD
+from .gear import GEAR
+from .raida import RAIDA
+from .ced import CED
+from .kaltest import KalTest, KalDet
+from .pathfinder import PathFinder
+from .bbq import BBQ
+from .gbl import GBL
+from .sio import SIO
 
-from ddkaltest import DDKalTest
+from .ddkaltest import DDKalTest
 
 # marlin & friends
-from marlinpkg import MarlinPKG
-from marlinpkg import ConfigPKG
-from marlin import Marlin
-from marlinutil import MarlinUtil
-from marlinreco import MarlinReco
-from cedviewer import CEDViewer
-from pandoranew import PandoraPFANew
-from pandoranew import PandoraAnalysis
-from pandoranew import MarlinPandora
-from lcfivertex import LCFIVertex
-from eutelescope import Eutelescope
-from overlay import Overlay
-from marlintpc import MarlinTPC
-from ckfit import CKFit
-from fastjet import FastJet, FastJetClustering
-from marlintrk import MarlinTrk
-from kitrack import KiTrack, KiTrackMarlin
+from .marlinpkg import MarlinPKG
+from .marlinpkg import ConfigPKG
+from .marlin import Marlin
+from .marlinutil import MarlinUtil
+from .marlinreco import MarlinReco
+from .cedviewer import CEDViewer
+from .pandoranew import PandoraPFANew
+from .pandoranew import PandoraAnalysis
+from .pandoranew import MarlinPandora
+from .lcfivertex import LCFIVertex
+from .eutelescope import Eutelescope
+from .overlay import Overlay
+from .marlintpc import MarlinTPC
+from .ckfit import CKFit
+from .fastjet import FastJet, FastJetClustering
+from .marlintrk import MarlinTrk
+from .kitrack import KiTrack, KiTrackMarlin
 #from ddmarlinpandora import DDMarlinPandora 
 
 #slic et al
-from gdml import GDML
-from ddsegmentation import DDSegmentation # standalone DDSegmentation install
-from lcdd import LCDD
-from slic import SLIC
-from slicpandora import SlicPandora
+from .gdml import GDML
+from .ddsegmentation import DDSegmentation # standalone DDSegmentation install
+from .lcdd import LCDD
+from .slic import SLIC
+from .slicpandora import SlicPandora
 
 #aida
-from dd4hep import DD4hep 
-from dd4hep_examples import DD4hepExamples
+from .dd4hep import DD4hep 
+from .dd4hep_examples import DD4hepExamples
 
-from lcgeo import lcgeo
-from podio import podio
-from edm4hep import edm4hep
+from .lcgeo import lcgeo
+from .podio import podio
+from .edm4hep import edm4hep
 
-from aidaTT import aidaTT 
+from .aidaTT import aidaTT 
 
 # simtools
 #from simtoolsmaker import SimToolsMaker
-from simtools import *  # modules defined in simtools/__init__.py
+from .simtools import *  # modules defined in simtools/__init__.py
 
 # cmake
-from cmake import CMake
+from .cmake import CMake
 
 # external (with install support)
-from druid import Druid
-from garlic import Garlic
-from mokka import Mokka
-from conddbmysql import CondDBMySQL
-from cernlib import CERNLIB
-from clhep import CLHEP
-from heppdt import HepPDT
-from gsl import GSL
-from xercesc import XercesC
-from heppdt import HepPDT
-from qt import QT
-from qt5 import Qt5
-from dcap import dcap
+from .druid import Druid
+from .garlic import Garlic
+from .mokka import Mokka
+from .conddbmysql import CondDBMySQL
+from .cernlib import CERNLIB
+from .clhep import CLHEP
+from .heppdt import HepPDT
+from .gsl import GSL
+from .xercesc import XercesC
+from .heppdt import HepPDT
+from .qt import QT
+from .qt5 import Qt5
+from .dcap import dcap
 
 
 
 # external (without install support)
-from root import ROOT
-from geant4 import Geant4
-from java import Java
-from mysql import MySQL
-from boost import Boost
-from eigen import Eigen
-from ninja import ninja
+from .root import ROOT
+from .geant4 import Geant4
+from .java import Java
+from .mysql import MySQL
+from .boost import Boost
+from .eigen import Eigen
+from .ninja import ninja
 
-from gcc481 import GCC481
+from .gcc481 import GCC481
diff --git a/ilcsoft/aidaTT.py b/ilcsoft/aidaTT.py
@@ -8,8 +8,8 @@
 ##################################################
 
 # custom imports
-from baseilc import BaseILC
-from util import *
+from .baseilc import BaseILC
+from .util import *
 
 
 class aidaTT(BaseILC):