From c5ef786701e9d69910c9e46b928130c9914347f0 Mon Sep 17 00:00:00 2001 From: Javier Date: Wed, 7 Jul 2021 12:56:42 +0200 Subject: [PATCH] Migration to python3 of DQM Subsystem packages --- DQM/DTMonitorModule/python/test/dtDqmPythonTypes.py | 2 +- DQM/Integration/python/config/dqmPythonTypes.py | 2 +- DQM/Integration/scripts/XMLcfgfiles/ExtractAppInfoFromXML | 2 +- .../scripts/XMLcfgfiles/ExtractAppInfoFromXML.py | 2 +- DQM/Integration/scripts/XMLcfgfiles/RCMSServerChecker | 2 +- DQM/Integration/scripts/XMLcfgfiles/getRunAppsInfo | 2 +- DQM/Integration/scripts/XMLcfgfiles/getRunAppsInfo.py | 2 +- DQM/Integration/scripts/XMLcfgfiles/psClasses.py | 2 +- DQM/Integration/scripts/XMLcfgfiles/pscram | 2 +- .../scripts/XMLcfgfiles/updateXMLcfgToCurrentRelease | 2 +- DQM/Integration/scripts/XMLcfgfiles/xmlcfgVerifier | 2 +- DQM/Integration/scripts/contentValuesCheck.py | 2 +- DQM/Integration/scripts/contentValuesFiles.py | 2 +- DQM/Integration/scripts/contentValuesToDBS.py | 2 +- DQM/Integration/scripts/contentValuesToRR.py | 2 +- DQM/Integration/scripts/dqmd_manager.py | 2 +- DQM/Integration/scripts/filecollector/createOnlineInfo | 2 +- DQM/Integration/scripts/filecollector/fileCollector.py | 2 +- DQM/Integration/scripts/filecollector/fileCollector2.py | 2 +- .../scripts/filecollector/producerFileCleanner.py | 2 +- DQM/Integration/scripts/filecollector/visDQMSyncDaemon | 2 +- .../scripts/fileregistration/dqmPostProcessing_online.py | 2 +- DQM/Integration/scripts/fileregistration/fileTransfer.py | 2 +- .../scripts/fileregistration/mergeAndRegister.py | 2 +- DQM/Integration/scripts/harvesting_tools/cmsHarvester.py | 2 +- DQM/Integration/scripts/igfilemgr/igmerge | 4 ++-- DQM/Integration/scripts/igfilemgr/zipmerge | 4 ++-- DQM/SiStripMonitorClient/scripts/DeadROCCounter.py | 2 +- DQM/SiStripMonitorClient/scripts/DeadROCCounter_Phase1.py | 2 +- DQM/SiStripMonitorClient/scripts/DeadROC_duringRun.py | 2 +- DQM/SiStripMonitorClient/scripts/MergeOccDeadROC.py | 2 +- DQM/SiStripMonitorClient/scripts/MergePCLDeadROC.py | 2 +- DQM/SiStripMonitorClient/scripts/MergePCLFedErr.py | 2 +- DQM/SiStripMonitorClient/scripts/PCLOthers.py | 2 +- DQM/SiStripMonitorClient/scripts/PhaseITreeProducer.py | 2 +- DQM/SiStripMonitorClient/scripts/PixelMapPlotter.py | 2 +- DQM/SiStripMonitorClient/scripts/TH2PolyOfflineMaps.py | 2 +- DQM/SiStripMonitorClient/scripts/TkMap_script_phase1.py | 6 +++--- DQM/SiStripMonitorClient/scripts/change_name.py | 2 +- DQM/SiStripMonitorClient/scripts/findBadModT9.py | 2 +- DQM/SiStripMonitorClient/scripts/getGTfromDQMFile.py | 2 +- DQM/SiStripMonitorClient/scripts/getGTfromDQMFile_V2.py | 2 +- DQM/SiStripMonitorClient/scripts/getRunInfo.py | 2 +- DQM/SiStripMonitorClient/scripts/submitDQMOfflineCAF.py | 2 +- DQM/SiStripMonitorSummary/scripts/iov_list_tag.py | 2 +- DQM/TrackerCommon/bin/getRunRegistry.py | 2 +- DQM/TrackerRemapper/test/PrintTkMap.py | 2 +- DQMOffline/Alignment/test/alcarecoTester.py | 2 +- DQMOffline/CalibCalo/test/compare.py | 2 +- DQMOffline/CalibCalo/test/dohistos.py | 2 +- .../test/testSuite/CheckSiStripBadCompoentnsDQMService.py | 2 +- DQMOffline/Configuration/scripts/cmsswConfigtrace.py | 2 +- DQMOffline/Configuration/scripts/cmsswFiletrace.py | 2 +- DQMOffline/EGamma/scripts/electronCompare.py | 2 +- DQMOffline/EGamma/scripts/electronDataDiscovery.py | 2 +- DQMOffline/EGamma/scripts/electronStore.py | 2 +- DQMOffline/EGamma/test/dbs_discovery.py | 2 +- DQMOffline/JetMET/test/DDSearchCLI.py | 2 +- DQMOffline/JetMET/test/publish/make_html_output.py | 2 +- 59 files changed, 63 insertions(+), 63 deletions(-) diff --git a/DQM/DTMonitorModule/python/test/dtDqmPythonTypes.py b/DQM/DTMonitorModule/python/test/dtDqmPythonTypes.py index 900f5879552ef..ca00aaf4db7a1 100644 --- a/DQM/DTMonitorModule/python/test/dtDqmPythonTypes.py +++ b/DQM/DTMonitorModule/python/test/dtDqmPythonTypes.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from FWCore.ParameterSet.Types import PSet import FWCore.ParameterSet.Config as cms diff --git a/DQM/Integration/python/config/dqmPythonTypes.py b/DQM/Integration/python/config/dqmPythonTypes.py index ce7f8be2f622c..c12f2757a05a8 100644 --- a/DQM/Integration/python/config/dqmPythonTypes.py +++ b/DQM/Integration/python/config/dqmPythonTypes.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from FWCore.ParameterSet.Types import PSet import FWCore.ParameterSet.Config as cms class RunType(PSet): diff --git a/DQM/Integration/scripts/XMLcfgfiles/ExtractAppInfoFromXML b/DQM/Integration/scripts/XMLcfgfiles/ExtractAppInfoFromXML index a5592039c4962..c75dce54049e6 100755 --- a/DQM/Integration/scripts/XMLcfgfiles/ExtractAppInfoFromXML +++ b/DQM/Integration/scripts/XMLcfgfiles/ExtractAppInfoFromXML @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Syntax: ExtracAppInfoFromXML [-sapc] file Parameters: diff --git a/DQM/Integration/scripts/XMLcfgfiles/ExtractAppInfoFromXML.py b/DQM/Integration/scripts/XMLcfgfiles/ExtractAppInfoFromXML.py index e0edc6e70a418..44b4d0e014f5f 100755 --- a/DQM/Integration/scripts/XMLcfgfiles/ExtractAppInfoFromXML.py +++ b/DQM/Integration/scripts/XMLcfgfiles/ExtractAppInfoFromXML.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Syntax: ExtracAppInfoFromXML [-sapc] file Parameters: diff --git a/DQM/Integration/scripts/XMLcfgfiles/RCMSServerChecker b/DQM/Integration/scripts/XMLcfgfiles/RCMSServerChecker index 95c4fb72f9ee5..0e16e266ad697 100644 --- a/DQM/Integration/scripts/XMLcfgfiles/RCMSServerChecker +++ b/DQM/Integration/scripts/XMLcfgfiles/RCMSServerChecker @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ This module checks if for a specifyed machine the RCMS jobcontrol daemon is running. diff --git a/DQM/Integration/scripts/XMLcfgfiles/getRunAppsInfo b/DQM/Integration/scripts/XMLcfgfiles/getRunAppsInfo index 0e66fd32bad1c..2b57379693102 100755 --- a/DQM/Integration/scripts/XMLcfgfiles/getRunAppsInfo +++ b/DQM/Integration/scripts/XMLcfgfiles/getRunAppsInfo @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """This module provides the PID and the log file name of the running DQM applications (consumers), thus completing the information generated by ExtractAppInfoFromXML. diff --git a/DQM/Integration/scripts/XMLcfgfiles/getRunAppsInfo.py b/DQM/Integration/scripts/XMLcfgfiles/getRunAppsInfo.py index 3b9cf359679d8..f74a285df7785 100755 --- a/DQM/Integration/scripts/XMLcfgfiles/getRunAppsInfo.py +++ b/DQM/Integration/scripts/XMLcfgfiles/getRunAppsInfo.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """This module provides the PID and the log file name of the running DQM applications (consumers), thus completing the information generated by ExtractAppInfoFromXML. diff --git a/DQM/Integration/scripts/XMLcfgfiles/psClasses.py b/DQM/Integration/scripts/XMLcfgfiles/psClasses.py index e026666643670..5648d4ed15da5 100644 --- a/DQM/Integration/scripts/XMLcfgfiles/psClasses.py +++ b/DQM/Integration/scripts/XMLcfgfiles/psClasses.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function from builtins import range import os,subprocess,sys,re,time,random diff --git a/DQM/Integration/scripts/XMLcfgfiles/pscram b/DQM/Integration/scripts/XMLcfgfiles/pscram index e1c1d8d4b3ebb..92c8df5915191 100755 --- a/DQM/Integration/scripts/XMLcfgfiles/pscram +++ b/DQM/Integration/scripts/XMLcfgfiles/pscram @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os,subprocess,sys,re,pprint,glob,getopt from psClasses import * diff --git a/DQM/Integration/scripts/XMLcfgfiles/updateXMLcfgToCurrentRelease b/DQM/Integration/scripts/XMLcfgfiles/updateXMLcfgToCurrentRelease index 2bbef2384331d..e8e3825c21803 100755 --- a/DQM/Integration/scripts/XMLcfgfiles/updateXMLcfgToCurrentRelease +++ b/DQM/Integration/scripts/XMLcfgfiles/updateXMLcfgToCurrentRelease @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Syntax: updateCMLcfgToCurrentRelease [-h] -r relNumber xmlcfgfile newfilename -h This text -r relNumber tell the script diff --git a/DQM/Integration/scripts/XMLcfgfiles/xmlcfgVerifier b/DQM/Integration/scripts/XMLcfgfiles/xmlcfgVerifier index 997b74a969146..e66c88af1aa8f 100755 --- a/DQM/Integration/scripts/XMLcfgfiles/xmlcfgVerifier +++ b/DQM/Integration/scripts/XMLcfgfiles/xmlcfgVerifier @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Syntax: xmlcfgVerifier [-fhv] XMLCfgFilename diff --git a/DQM/Integration/scripts/contentValuesCheck.py b/DQM/Integration/scripts/contentValuesCheck.py index 6a054b1d95c96..d2d473cc2c47d 100755 --- a/DQM/Integration/scripts/contentValuesCheck.py +++ b/DQM/Integration/scripts/contentValuesCheck.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function from contentValuesLib import * diff --git a/DQM/Integration/scripts/contentValuesFiles.py b/DQM/Integration/scripts/contentValuesFiles.py index 34c4146287f0b..39b636168a59a 100755 --- a/DQM/Integration/scripts/contentValuesFiles.py +++ b/DQM/Integration/scripts/contentValuesFiles.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from contentValuesLib import * import xml.dom.minidom diff --git a/DQM/Integration/scripts/contentValuesToDBS.py b/DQM/Integration/scripts/contentValuesToDBS.py index b579df0b8e202..e2180107216cd 100755 --- a/DQM/Integration/scripts/contentValuesToDBS.py +++ b/DQM/Integration/scripts/contentValuesToDBS.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function from contentValuesLib import * diff --git a/DQM/Integration/scripts/contentValuesToRR.py b/DQM/Integration/scripts/contentValuesToRR.py index 2dddf8879f9d3..dc1b53703d11e 100755 --- a/DQM/Integration/scripts/contentValuesToRR.py +++ b/DQM/Integration/scripts/contentValuesToRR.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function from contentValuesLib import * diff --git a/DQM/Integration/scripts/dqmd_manager.py b/DQM/Integration/scripts/dqmd_manager.py index 26d15604a01c2..6a95cf3563174 100755 --- a/DQM/Integration/scripts/dqmd_manager.py +++ b/DQM/Integration/scripts/dqmd_manager.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import sys diff --git a/DQM/Integration/scripts/filecollector/createOnlineInfo b/DQM/Integration/scripts/filecollector/createOnlineInfo index 21b0be34e4dbc..400e2b377a9c3 100755 --- a/DQM/Integration/scripts/filecollector/createOnlineInfo +++ b/DQM/Integration/scripts/filecollector/createOnlineInfo @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os, re, hashlib, time, sys from traceback import print_exc from datetime import datetime diff --git a/DQM/Integration/scripts/filecollector/fileCollector.py b/DQM/Integration/scripts/filecollector/fileCollector.py index 7f9d445a806d2..a1af438eef9e5 100755 --- a/DQM/Integration/scripts/filecollector/fileCollector.py +++ b/DQM/Integration/scripts/filecollector/fileCollector.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 from __future__ import print_function from builtins import range import os, time, sys, glob, re, shutil, stat, smtplib, socket diff --git a/DQM/Integration/scripts/filecollector/fileCollector2.py b/DQM/Integration/scripts/filecollector/fileCollector2.py index d928694b45c17..ffd125df7ee9c 100755 --- a/DQM/Integration/scripts/filecollector/fileCollector2.py +++ b/DQM/Integration/scripts/filecollector/fileCollector2.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 from __future__ import print_function from builtins import range diff --git a/DQM/Integration/scripts/filecollector/producerFileCleanner.py b/DQM/Integration/scripts/filecollector/producerFileCleanner.py index 2750284fc1f20..61ac98d5d2c98 100755 --- a/DQM/Integration/scripts/filecollector/producerFileCleanner.py +++ b/DQM/Integration/scripts/filecollector/producerFileCleanner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import os, time, sys, glob, re, smtplib, socket from email.MIMEText import MIMEText diff --git a/DQM/Integration/scripts/filecollector/visDQMSyncDaemon b/DQM/Integration/scripts/filecollector/visDQMSyncDaemon index 6f4ab6afa08d3..632238c799d29 100755 --- a/DQM/Integration/scripts/filecollector/visDQMSyncDaemon +++ b/DQM/Integration/scripts/filecollector/visDQMSyncDaemon @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Daemon to keep a root file repository with another directory (AFS) in sync under certain rules of size and subdirs Usage: visDQMSyncDaemon [-fd][--dirs=..,..][--dirs_quotas=..,..] MAX_QUOTA ROOT_REPO DEST_DIR diff --git a/DQM/Integration/scripts/fileregistration/dqmPostProcessing_online.py b/DQM/Integration/scripts/fileregistration/dqmPostProcessing_online.py index 9d41a43254b4c..bcc10b0fa96ba 100755 --- a/DQM/Integration/scripts/fileregistration/dqmPostProcessing_online.py +++ b/DQM/Integration/scripts/fileregistration/dqmPostProcessing_online.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 from __future__ import print_function import os, time, sys, shutil, glob, smtplib, re diff --git a/DQM/Integration/scripts/fileregistration/fileTransfer.py b/DQM/Integration/scripts/fileregistration/fileTransfer.py index 186968013900a..898acbb2aa5c6 100755 --- a/DQM/Integration/scripts/fileregistration/fileTransfer.py +++ b/DQM/Integration/scripts/fileregistration/fileTransfer.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import os, time, sys, shutil, glob, smtplib, re, commands diff --git a/DQM/Integration/scripts/fileregistration/mergeAndRegister.py b/DQM/Integration/scripts/fileregistration/mergeAndRegister.py index 3b32b716271e3..d6f8f4ef4a7c2 100755 --- a/DQM/Integration/scripts/fileregistration/mergeAndRegister.py +++ b/DQM/Integration/scripts/fileregistration/mergeAndRegister.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 from __future__ import print_function import os,time,sys,shutil,glob diff --git a/DQM/Integration/scripts/harvesting_tools/cmsHarvester.py b/DQM/Integration/scripts/harvesting_tools/cmsHarvester.py index 7921ef2bbceca..710766fcf1ab5 100755 --- a/DQM/Integration/scripts/harvesting_tools/cmsHarvester.py +++ b/DQM/Integration/scripts/harvesting_tools/cmsHarvester.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 ########################################################################### ## File : cmsHarvest.py diff --git a/DQM/Integration/scripts/igfilemgr/igmerge b/DQM/Integration/scripts/igfilemgr/igmerge index 99894888c645f..8e371db0422ba 100755 --- a/DQM/Integration/scripts/igfilemgr/igmerge +++ b/DQM/Integration/scripts/igfilemgr/igmerge @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 """ zipmerge [-sret] [-n size ] [--help] [-o name] file1 file2 [filen...] @@ -71,7 +71,7 @@ def openOutputZipFile(filename): key="x" while key not in ["y","Y","n","N","a","A","all","All",""] and not ALL: print "\nOutput file %s already exist and will be overwriten!!!" % filename - key=raw_input("Do you want to proceed? (y,n,[all])") + key=input("Do you want to proceed? (y,n,[all])") ALL=key in ["a","A","all","All",""] if key in ["y","Y",""] or ALL: os.remove(filename) diff --git a/DQM/Integration/scripts/igfilemgr/zipmerge b/DQM/Integration/scripts/igfilemgr/zipmerge index f61a300dd832d..4ab597de8feef 100755 --- a/DQM/Integration/scripts/igfilemgr/zipmerge +++ b/DQM/Integration/scripts/igfilemgr/zipmerge @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 """ zipmerge [-sret] [-n size ] [--help] [-o name] file1 file2 [filen...] @@ -47,7 +47,7 @@ def openOutputZipFile(filename): key="x" while key not in ["y","Y","n","N","a","A","all","All",""] and not ALL: print "\nOutput file %s already exist and will be overwriten!!!" % filename - key=raw_input("Do you want to proceed? (y,n,[all])") + key=input("Do you want to proceed? (y,n,[all])") ALL=key in ["a","A","all","All",""] if key in ["y","Y",""] or ALL: os.remove(filename) diff --git a/DQM/SiStripMonitorClient/scripts/DeadROCCounter.py b/DQM/SiStripMonitorClient/scripts/DeadROCCounter.py index 3093f7546396f..d43518becdf60 100755 --- a/DQM/SiStripMonitorClient/scripts/DeadROCCounter.py +++ b/DQM/SiStripMonitorClient/scripts/DeadROCCounter.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function from ROOT import TFile, gStyle,gPad ,TObject, TCanvas, TH1, TH1F, TH2F, TLegend, TPaletteAxis, TList, TLine, TAttLine, TF1,TAxis import re diff --git a/DQM/SiStripMonitorClient/scripts/DeadROCCounter_Phase1.py b/DQM/SiStripMonitorClient/scripts/DeadROCCounter_Phase1.py index 7a5070371a03d..0d1c02561f4c1 100755 --- a/DQM/SiStripMonitorClient/scripts/DeadROCCounter_Phase1.py +++ b/DQM/SiStripMonitorClient/scripts/DeadROCCounter_Phase1.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function from ROOT import TFile, gStyle,gPad ,TObject, TCanvas, TH1, TH1F, TH2F, TLegend, TPaletteAxis, TList, TLine, TAttLine, TF1,TAxis import re diff --git a/DQM/SiStripMonitorClient/scripts/DeadROC_duringRun.py b/DQM/SiStripMonitorClient/scripts/DeadROC_duringRun.py index d4e3b6858c17a..6c7943310465b 100755 --- a/DQM/SiStripMonitorClient/scripts/DeadROC_duringRun.py +++ b/DQM/SiStripMonitorClient/scripts/DeadROC_duringRun.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import sys diff --git a/DQM/SiStripMonitorClient/scripts/MergeOccDeadROC.py b/DQM/SiStripMonitorClient/scripts/MergeOccDeadROC.py index 82b9bd75841d2..c42f347dcdf17 100755 --- a/DQM/SiStripMonitorClient/scripts/MergeOccDeadROC.py +++ b/DQM/SiStripMonitorClient/scripts/MergeOccDeadROC.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import ROOT diff --git a/DQM/SiStripMonitorClient/scripts/MergePCLDeadROC.py b/DQM/SiStripMonitorClient/scripts/MergePCLDeadROC.py index 6d5b113af696a..4e9d8a5a5108f 100755 --- a/DQM/SiStripMonitorClient/scripts/MergePCLDeadROC.py +++ b/DQM/SiStripMonitorClient/scripts/MergePCLDeadROC.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import ROOT diff --git a/DQM/SiStripMonitorClient/scripts/MergePCLFedErr.py b/DQM/SiStripMonitorClient/scripts/MergePCLFedErr.py index 55fdbd6808ad0..331e9b6634338 100755 --- a/DQM/SiStripMonitorClient/scripts/MergePCLFedErr.py +++ b/DQM/SiStripMonitorClient/scripts/MergePCLFedErr.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import ROOT diff --git a/DQM/SiStripMonitorClient/scripts/PCLOthers.py b/DQM/SiStripMonitorClient/scripts/PCLOthers.py index 07d37563ca6ad..322d31e2daa75 100755 --- a/DQM/SiStripMonitorClient/scripts/PCLOthers.py +++ b/DQM/SiStripMonitorClient/scripts/PCLOthers.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import ROOT diff --git a/DQM/SiStripMonitorClient/scripts/PhaseITreeProducer.py b/DQM/SiStripMonitorClient/scripts/PhaseITreeProducer.py index 3de4cbf627ac9..7d221d37a86a3 100755 --- a/DQM/SiStripMonitorClient/scripts/PhaseITreeProducer.py +++ b/DQM/SiStripMonitorClient/scripts/PhaseITreeProducer.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import sys diff --git a/DQM/SiStripMonitorClient/scripts/PixelMapPlotter.py b/DQM/SiStripMonitorClient/scripts/PixelMapPlotter.py index 75482b7828d34..43c9da887c93a 100755 --- a/DQM/SiStripMonitorClient/scripts/PixelMapPlotter.py +++ b/DQM/SiStripMonitorClient/scripts/PixelMapPlotter.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import ROOT diff --git a/DQM/SiStripMonitorClient/scripts/TH2PolyOfflineMaps.py b/DQM/SiStripMonitorClient/scripts/TH2PolyOfflineMaps.py index 4ff3bd7fe6bde..ea45286173d46 100755 --- a/DQM/SiStripMonitorClient/scripts/TH2PolyOfflineMaps.py +++ b/DQM/SiStripMonitorClient/scripts/TH2PolyOfflineMaps.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import sys diff --git a/DQM/SiStripMonitorClient/scripts/TkMap_script_phase1.py b/DQM/SiStripMonitorClient/scripts/TkMap_script_phase1.py index 3dc915a35d43d..bdeeab927d29a 100755 --- a/DQM/SiStripMonitorClient/scripts/TkMap_script_phase1.py +++ b/DQM/SiStripMonitorClient/scripts/TkMap_script_phase1.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import sys @@ -196,7 +196,7 @@ def getGT(DQMfile, RunNumber, globalTagVar): print('Using DQM file: '+File_Name) else: print('*****************Warning: DQM file is not ready************************') - input_var = raw_input("DQM file is incompleted, do you want to continue? (y/n): ") + input_var = input("DQM file is incompleted, do you want to continue? (y/n): ") if (input_var == 'y') or (input_var == 'Y'): print('Using DQM file: '+File_Name) else: @@ -206,7 +206,7 @@ def getGT(DQMfile, RunNumber, globalTagVar): print(' ') print(' ') print('*****************Warning: PCL file is not ready************************') - input_var = raw_input("PCL file is not ready, you will need to re-run the script later for PCL plots, do you want to continue? (y/n): ") + input_var = input("PCL file is not ready, you will need to re-run the script later for PCL plots, do you want to continue? (y/n): ") if (input_var == 'y') or (input_var == 'Y'): print('--------> Remember to re-run the script later!!!!!') else: diff --git a/DQM/SiStripMonitorClient/scripts/change_name.py b/DQM/SiStripMonitorClient/scripts/change_name.py index d528cc66c753b..10be6c1668bb4 100755 --- a/DQM/SiStripMonitorClient/scripts/change_name.py +++ b/DQM/SiStripMonitorClient/scripts/change_name.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys diff --git a/DQM/SiStripMonitorClient/scripts/findBadModT9.py b/DQM/SiStripMonitorClient/scripts/findBadModT9.py index 42cb85c0b66a9..31c8b84605d93 100644 --- a/DQM/SiStripMonitorClient/scripts/findBadModT9.py +++ b/DQM/SiStripMonitorClient/scripts/findBadModT9.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 #this script: #Find which Modules bad in the PCL and which are NOT bad in the DQM (express) (and dumps the info in a txt file) #Find which modules are bad in the DQM (express) and which are still bad in DQM prompt (not because they are masked) (and dumps the info in a txt file) diff --git a/DQM/SiStripMonitorClient/scripts/getGTfromDQMFile.py b/DQM/SiStripMonitorClient/scripts/getGTfromDQMFile.py index 21cdda438c6e5..1588ec0e7ecd5 100755 --- a/DQM/SiStripMonitorClient/scripts/getGTfromDQMFile.py +++ b/DQM/SiStripMonitorClient/scripts/getGTfromDQMFile.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function from math import * from ROOT import TFile, TObject, TTree diff --git a/DQM/SiStripMonitorClient/scripts/getGTfromDQMFile_V2.py b/DQM/SiStripMonitorClient/scripts/getGTfromDQMFile_V2.py index 1fc531ffd3d0c..f40ee6b3f8eba 100755 --- a/DQM/SiStripMonitorClient/scripts/getGTfromDQMFile_V2.py +++ b/DQM/SiStripMonitorClient/scripts/getGTfromDQMFile_V2.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from math import * from ROOT import TFile, TObject, TTree from array import array diff --git a/DQM/SiStripMonitorClient/scripts/getRunInfo.py b/DQM/SiStripMonitorClient/scripts/getRunInfo.py index 3e037e6b323e3..2dd9bf3d86451 100755 --- a/DQM/SiStripMonitorClient/scripts/getRunInfo.py +++ b/DQM/SiStripMonitorClient/scripts/getRunInfo.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # diff --git a/DQM/SiStripMonitorClient/scripts/submitDQMOfflineCAF.py b/DQM/SiStripMonitorClient/scripts/submitDQMOfflineCAF.py index 2d60d1655d69b..1565665fb07fb 100755 --- a/DQM/SiStripMonitorClient/scripts/submitDQMOfflineCAF.py +++ b/DQM/SiStripMonitorClient/scripts/submitDQMOfflineCAF.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # diff --git a/DQM/SiStripMonitorSummary/scripts/iov_list_tag.py b/DQM/SiStripMonitorSummary/scripts/iov_list_tag.py index 8fd8c5d691d04..024296bbc7a56 100755 --- a/DQM/SiStripMonitorSummary/scripts/iov_list_tag.py +++ b/DQM/SiStripMonitorSummary/scripts/iov_list_tag.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function from optparse import OptionParser, Option, OptionValueError import DLFCN diff --git a/DQM/TrackerCommon/bin/getRunRegistry.py b/DQM/TrackerCommon/bin/getRunRegistry.py index 2ef0c0d52f8c0..e211eb870b957 100755 --- a/DQM/TrackerCommon/bin/getRunRegistry.py +++ b/DQM/TrackerCommon/bin/getRunRegistry.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # For documentation of the RR XML-RPC handler, look into https://twiki.cern.ch/twiki//bin/view/CMS/DqmRrApi diff --git a/DQM/TrackerRemapper/test/PrintTkMap.py b/DQM/TrackerRemapper/test/PrintTkMap.py index 9bbfc066c174e..c60474f267947 100644 --- a/DQM/TrackerRemapper/test/PrintTkMap.py +++ b/DQM/TrackerRemapper/test/PrintTkMap.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import sys diff --git a/DQMOffline/Alignment/test/alcarecoTester.py b/DQMOffline/Alignment/test/alcarecoTester.py index a2d34028d54ee..d617df0300135 100755 --- a/DQMOffline/Alignment/test/alcarecoTester.py +++ b/DQMOffline/Alignment/test/alcarecoTester.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import os diff --git a/DQMOffline/CalibCalo/test/compare.py b/DQMOffline/CalibCalo/test/compare.py index bb7af46152a9c..2014672341170 100755 --- a/DQMOffline/CalibCalo/test/compare.py +++ b/DQMOffline/CalibCalo/test/compare.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 import os import sys diff --git a/DQMOffline/CalibCalo/test/dohistos.py b/DQMOffline/CalibCalo/test/dohistos.py index 37aab64446dcf..795fcfdf7b095 100755 --- a/DQMOffline/CalibCalo/test/dohistos.py +++ b/DQMOffline/CalibCalo/test/dohistos.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 from __future__ import print_function import os diff --git a/DQMOffline/CalibTracker/test/testSuite/CheckSiStripBadCompoentnsDQMService.py b/DQMOffline/CalibTracker/test/testSuite/CheckSiStripBadCompoentnsDQMService.py index a100814a75ca7..cdc8de42175db 100755 --- a/DQMOffline/CalibTracker/test/testSuite/CheckSiStripBadCompoentnsDQMService.py +++ b/DQMOffline/CalibTracker/test/testSuite/CheckSiStripBadCompoentnsDQMService.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This script compares the writer output with the reader output. # - run the SiStripBadComponentsDQMService.py > logReader diff --git a/DQMOffline/Configuration/scripts/cmsswConfigtrace.py b/DQMOffline/Configuration/scripts/cmsswConfigtrace.py index 1f14187a0b265..b5ad57f4c9929 100755 --- a/DQMOffline/Configuration/scripts/cmsswConfigtrace.py +++ b/DQMOffline/Configuration/scripts/cmsswConfigtrace.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import os import re diff --git a/DQMOffline/Configuration/scripts/cmsswFiletrace.py b/DQMOffline/Configuration/scripts/cmsswFiletrace.py index f817111954619..d6f30894f0f1a 100755 --- a/DQMOffline/Configuration/scripts/cmsswFiletrace.py +++ b/DQMOffline/Configuration/scripts/cmsswFiletrace.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import os import re diff --git a/DQMOffline/EGamma/scripts/electronCompare.py b/DQMOffline/EGamma/scripts/electronCompare.py index f205213229c92..17f8994b6e7c9 100755 --- a/DQMOffline/EGamma/scripts/electronCompare.py +++ b/DQMOffline/EGamma/scripts/electronCompare.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 #======================================================================== # diff --git a/DQMOffline/EGamma/scripts/electronDataDiscovery.py b/DQMOffline/EGamma/scripts/electronDataDiscovery.py index a0a30a734e978..128662d237128 100755 --- a/DQMOffline/EGamma/scripts/electronDataDiscovery.py +++ b/DQMOffline/EGamma/scripts/electronDataDiscovery.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import os, sys diff --git a/DQMOffline/EGamma/scripts/electronStore.py b/DQMOffline/EGamma/scripts/electronStore.py index e74620850e6c9..4a2a393800207 100755 --- a/DQMOffline/EGamma/scripts/electronStore.py +++ b/DQMOffline/EGamma/scripts/electronStore.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 #======================================================================== # diff --git a/DQMOffline/EGamma/test/dbs_discovery.py b/DQMOffline/EGamma/test/dbs_discovery.py index d30dd9415dbbd..bf13da4b40bb5 100755 --- a/DQMOffline/EGamma/test/dbs_discovery.py +++ b/DQMOffline/EGamma/test/dbs_discovery.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 #=================================================================== # This python script is querying https://cmsweb.cern.ch/dbs_discovery/ diff --git a/DQMOffline/JetMET/test/DDSearchCLI.py b/DQMOffline/JetMET/test/DDSearchCLI.py index f998e93a9c008..0f90aab2bb2a6 100755 --- a/DQMOffline/JetMET/test/DDSearchCLI.py +++ b/DQMOffline/JetMET/test/DDSearchCLI.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 #-*- coding: ISO-8859-1 -*- # # diff --git a/DQMOffline/JetMET/test/publish/make_html_output.py b/DQMOffline/JetMET/test/publish/make_html_output.py index 4425815406520..ec3772d456f94 100755 --- a/DQMOffline/JetMET/test/publish/make_html_output.py +++ b/DQMOffline/JetMET/test/publish/make_html_output.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import ROOT