Merge pull request #46767 from smuzaffar/dqm-py23-compatibility

[DQM] py2/3 compatibility:drop use of __future__

DPGAnalysis/HcalTools/scripts/cmt/das_client.py

@@ -5,7 +5,6 @@
 """
 DAS command line tool
 """
-from __future__ import print_function
 __author__ = "Valentin Kuznetsov"
 
 # system modules

DQM/CSCMonitorModule/data/bookConverter.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import xml.dom.minidom as dom
 import sys, os, optparse
 

DQM/CSCMonitorModule/data/buildHistoTypes.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from Cheetah.Template import Template
 from getopt import getopt
 from sys import argv, exit

DQM/CSCMonitorModule/data/combine.py

@@ -1,6 +1,5 @@
 #!python
 
-from __future__ import print_function
 histos={}
 missing={}
 

DQM/CSCMonitorModule/test/dqm_dev_test_new_unpacker.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process("CSCDQMLIVE")

DQM/CSCMonitorModule/test/dqm_repacker_test.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process("CSCDQMLIVE")

DQM/DTMonitorModule/python/slice_test_customizations_cff.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms                                                
 
 def customise_for_slice_test(process, enableDigis, enableTPs):

DQM/DTMonitorModule/python/test/dt_dqm_sourceclient-live_GlobalRun_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process("DTDQM")

DQM/DTMonitorModule/python/test/dt_dqm_sourceclient-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 import FWCore.ParameterSet.VarParsing as VarParsing
 

DQM/DTMonitorModule/python/test/inputsource_live_cfi.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 import FWCore.ParameterSet.VarParsing as VarParsing
 

DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
 # Define here the BeamSpotOnline record name,

DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 import time 
 

DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
 # Define once the BeamSpotOnline record name,

DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
 # Define here the BeamSpotOnline record name,

DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
 import sys

DQM/Integration/python/clients/beamspotdip_dqm_sourceclient-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
 # copy log4cplus.properties from >script directory< to >local<

DQM/Integration/python/clients/bril_dqm_clientPB-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 from DQMServices.Core.DQMEDHarvester import DQMEDHarvester
 

DQM/Integration/python/clients/castor_dqm_sourceclient-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 import sys
 

DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 import sys
 

DQM/Integration/python/clients/dt4ml_dqm_sourceclient-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 import sys
 import os

DQM/Integration/python/clients/dt_dqm_sourceclient-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 import sys
 

DQM/Integration/python/clients/es_dqm_sourceclient-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 import sys
 

DQM/Integration/python/clients/hcalreco_dqm_sourceclient-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 #-------------------------------------
 #	Hcal DQM Application using New DQM Sources/Clients
 #	Online Mode

DQM/Integration/python/clients/l1t_dqm_sourceclient-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 # L1 Trigger DQM sequence (L1T)
 #
 #   authors previous versions - see CVS

DQM/Integration/python/clients/l1temulator_dqm_sourceclient-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 # L1 Emulator DQM sequence
 #
 #   authors previous versions - see CVS

DQM/Integration/python/clients/l1tstage1_dqm_sourceclient-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 # L1 Trigger DQM sequence (L1T)
 #
 #   authors previous versions - see CVS

DQM/Integration/python/clients/l1tstage1emulator_dqm_sourceclient-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 # L1 Emulator DQM sequence
 #
 #   authors previous versions - see CVS

DQM/Integration/python/clients/mutracking_dqm_sourceclient-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
 import sys

DQM/Integration/python/clients/onlinebeammonitor_dqm_sourceclient-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
 # Define once the BeamSpotOnline record name,

DQM/Integration/python/clients/physics_dqm_sourceclient-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import sys
 # $Id: physics_dqm_sourceclient-live_cfg.py,v 1.11 2012/02/13 15:09:30 lilopera Exp $
 

DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
 import sys

DQM/Integration/python/clients/pixellumi_dqm_sourceclient-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 import sys
 

DQM/Integration/python/clients/rpc_dqm_sourceclient-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 
 import sys
 import FWCore.ParameterSet.Config as cms

DQM/Integration/python/clients/sistrip_approx_dqm_sourceclient-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
 import sys

DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
 import sys

DQM/Integration/python/clients/visualization-live-secondInstance_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import re, os, sys
 import FWCore.ParameterSet.Config as cms
 from Configuration.DataProcessing.GetScenario import getScenario

DQM/Integration/python/clients/visualization-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import re, os, sys
 import FWCore.ParameterSet.Config as cms
 from Configuration.DataProcessing.GetScenario import getScenario

DQM/Integration/python/config/FrontierCondition_GT_autoExpress_cfi.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 from Configuration.StandardSequences.FrontierConditions_GlobalTag_cff import *
 from Configuration.AlCa.autoCond import autoCond

DQM/Integration/python/config/environment_cfi.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import os
 import FWCore.ParameterSet.Config as cms
 import configparser as ConfigParser

DQM/Integration/python/config/fileinputsource_cfi.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-from __future__ import absolute_import
 from builtins import range
 import FWCore.ParameterSet.Config as cms
 

DQM/Integration/python/config/inputsource_cfi.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-from __future__ import absolute_import
 import FWCore.ParameterSet.Config as cms
 import FWCore.ParameterSet.VarParsing as VarParsing
 

DQM/Integration/python/config/pbsource_cfi.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-from __future__ import absolute_import
 import FWCore.ParameterSet.Config as cms
 import FWCore.ParameterSet.VarParsing as VarParsing
 

DQM/Integration/python/config/unittestinputsource_cfi.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-from __future__ import absolute_import
 from builtins import range
 import FWCore.ParameterSet.Config as cms
 

DQM/Integration/python/config/unitteststreamerinputsource_cfi.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-from __future__ import absolute_import
 from builtins import range
 import os, sys
 import FWCore.ParameterSet.Config as cms

DQM/Integration/scripts/XMLcfgfiles/ExtractAppInfoFromXML.py

@@ -19,7 +19,6 @@
 		 
 	OUTPUT is always unique in a per row bases
 """
-from __future__ import print_function
 ################################################################################
 from builtins import range
 import sys, os.path

DQM/Integration/scripts/XMLcfgfiles/getRunAppsInfo.py

@@ -7,7 +7,6 @@
 	-f Show all columns
 	-h show headers
 """
-from __future__ import print_function
 import sys
 import os.path
 import getopt as gop

DQM/Integration/scripts/XMLcfgfiles/psClasses.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-from __future__ import print_function
 from builtins import range
 import os,subprocess,sys,re,time,random
 from threading import *

DQM/Integration/scripts/contentValuesCheck.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 from contentValuesLib import *
 
 class OptionParser(optparse.OptionParser):

DQM/Integration/scripts/contentValuesLib.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import sys, os, optparse, re, json
 import ROOT, xmlrpclib
 

DQM/Integration/scripts/contentValuesToDBS.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 from contentValuesLib import *
 
 class OptionParser(optparse.OptionParser):

DQM/Integration/scripts/contentValuesToRR.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 from contentValuesLib import *
 
 class OptionParser(optparse.OptionParser):

DQM/Integration/scripts/dqmd_manager.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 import sys
 import subprocess
 

DQM/Integration/scripts/filecollector/fileCollector.py

@@ -1,5 +1,4 @@
 #! /usr/bin/env python3
-from __future__ import print_function
 from builtins import range
 import os, time, sys, glob, re, shutil, stat, smtplib, socket
 from email.MIMEText import MIMEText

DQM/Integration/scripts/filecollector/fileCollector2.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python3
 
-from __future__ import print_function
 from builtins import range
 import os,time,sys,zipfile,re,shutil,stat
 from fcntl import lockf, LOCK_EX, LOCK_UN

DQM/Integration/scripts/filecollector/producerFileCleanner.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-from __future__ import print_function
 import os, time, sys, glob, re, smtplib, socket
 from email.MIMEText import MIMEText
 from traceback import print_exc, format_exc

DQM/Integration/scripts/fileregistration/dqmPostProcessing_online.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python3
 
-from __future__ import print_function
 import os, time, sys, shutil, glob, smtplib, re
 from datetime import datetime
 from email.MIMEText import MIMEText

DQM/Integration/scripts/fileregistration/fileTransfer.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 import os, time, sys, shutil, glob, smtplib, re, subprocess
 import getopt as gop
 import zipfile as zp

DQM/Integration/scripts/fileregistration/mergeAndRegister.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python3
 
-from __future__ import print_function
 import os,time,sys,shutil,glob
 from sets import Set
 from datetime import datetime

DQM/Integration/scripts/harvesting_tools/cmsHarvester.py

@@ -31,7 +31,6 @@
 methods.
 
 """
-from __future__ import print_function
 
 ###########################################################################
 

DQM/L1TMonitor/python/inputsource_file_cfi.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 #
 # provide online L1 Trigger DQM input from file(s)
 #

DQM/L1TMonitor/test/l1t_dqm_sourceclient-file_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 #
 # cfg file to run online L1 Trigger DQM
 #     the user can choose the environment (live, playback, file-P5, file)

DQM/L1TMonitor/test/l1temulator_dqm_sourceclient-file_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 #
 # cfg file to run online L1 Trigger emulator DQM
 #     the user can choose the environment (live, playback, file-P5, file)

DQM/MuonMonitor/test/mutracking_dqm_sourceclient-live_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
 from Configuration.Eras.Era_Run2_2018_pp_on_AA_cff import Run2_2018_pp_on_AA

DQM/SiStripMonitorClient/scripts/DeadROCCounter.py

@@ -1,5 +1,4 @@
 #!/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
 import sys, string

DQM/SiStripMonitorClient/scripts/DeadROCCounter_Phase1.py

@@ -1,5 +1,4 @@
 #!/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
 import sys, string

DQM/SiStripMonitorClient/scripts/DeadROC_duringRun.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 import sys
 import string
 from ROOT import TFile

DQM/SiStripMonitorClient/scripts/InefficientDoubleROC.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 import sys
 import math
 from ROOT import gROOT, TClass, TFile

DQM/SiStripMonitorClient/scripts/MergeOccDeadROC.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 import ROOT
 from ROOT import TBufferFile, TH1F, TProfile, TProfile2D, TH2F, TFile, TH1D, TH2D
 import re

DQM/SiStripMonitorClient/scripts/MergePCLDeadROC.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 import ROOT
 from ROOT import TBufferFile, TH1F, TProfile, TProfile2D, TH2F, TFile, TH1D, TH2D
 import re

DQM/SiStripMonitorClient/scripts/MergePCLFedErr.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 import ROOT
 from ROOT import TBufferFile, TH1F, TProfile, TProfile2D, TH2F, TFile, TH1D, TH2D
 import re