Merge pull request #46768 from smuzaffar/analysis-py23-compatibility

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

DPGAnalysis/SiStripTools/test/MultiplicityMonitor_cfg.py

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

MuonAnalysis/MuonAssociators/python/patMuonsWithTrigger_8E29_cff.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 print("MuonAnalysis.MuonAssociators.patMuonsWithTrigger_8E29_cff is deprecated.\nUse use MuonAnalysis.MuonAssociators.patMuonsWithTrigger_cff instead.\n")
 
 from MuonAnalysis.MuonAssociators.patMuonsWithTrigger_cff import *

MuonAnalysis/MuonAssociators/python/patMuonsWithTrigger_cff.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
 ##    __  __       _          ____   _  _____   __  __

PhysicsTools/FWLite/scripts/newFWLiteAna.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python3
 
-from __future__ import print_function
 from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter
 import os
 import sys

PhysicsTools/Heppy/python/analyzers/core/Analyzer.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import os 
 import logging 
 

PhysicsTools/Heppy/python/analyzers/core/AutoHandle.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 #ROOTTOOLS
 from DataFormats.FWLite import Events, Handle
 

PhysicsTools/Heppy/python/analyzers/core/EventSelector.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from PhysicsTools.HeppyCore.framework.analyzer import Analyzer
 
 

PhysicsTools/Heppy/python/analyzers/core/ProvenanceAnalyzer.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from builtins import range
 import itertools
 

PhysicsTools/Heppy/python/analyzers/core/SkimAnalyzerCount.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import itertools
 
 from PhysicsTools.Heppy.analyzers.core.Analyzer import Analyzer

PhysicsTools/Heppy/python/analyzers/core/TreeAnalyzerNumpy.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from PhysicsTools.Heppy.analyzers.core.Analyzer import Analyzer
 from PhysicsTools.HeppyCore.statistics.tree import Tree as Tree
 from ROOT import TFile

PhysicsTools/Heppy/python/analyzers/core/TriggerBitAnalyzer.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import ROOT
 
 from PhysicsTools.Heppy.analyzers.core.Analyzer import Analyzer

PhysicsTools/Heppy/python/analyzers/core/TriggerMatchAnalyzer.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import ROOT
 
 from PhysicsTools.Heppy.analyzers.core.Analyzer import Analyzer

PhysicsTools/Heppy/python/analyzers/examples/MetAnalyzer.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import copy
 from PhysicsTools.HeppyCore.framework.analyzer import Analyzer
 from PhysicsTools.Heppy.analyzers.AutoHandle import AutoHandle

PhysicsTools/Heppy/python/analyzers/examples/SimpleTreeAnalyzer.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 from PhysicsTools.Heppy.analyzers.core.TreeAnalyzerNumpy import TreeAnalyzerNumpy
 from . import ntuple
 

PhysicsTools/Heppy/python/analyzers/examples/TriggerAnalyzer.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from PhysicsTools.HeppyCore.framework.analyzer import Analyzer
 from PhysicsTools.Heppy.analyzers.AutoHandle import AutoHandle
 from PhysicsTools.HeppyCore.statistics.counter import Counter

PhysicsTools/Heppy/python/analyzers/examples/ZEleEleAnalyzer.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from PhysicsTools.Heppy.analyzers.DiLeptonAnalyzer import DiLeptonAnalyzer
 from PhysicsTools.Heppy.analyzers.AutoHandle import AutoHandle
 from PhysicsTools.Heppy.physicsobjects.DiObject import DiElectron

PhysicsTools/Heppy/python/analyzers/examples/ZJetsTreeAnalyzer.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 from PhysicsTools.Heppy.analyzers.core.TreeAnalyzerNumpy import TreeAnalyzerNumpy
 from . import ntuple
 

PhysicsTools/Heppy/python/analyzers/examples/ZMuMuAnalyzer.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from PhysicsTools.Heppy.analyzers.DiLeptonAnalyzer import DiLeptonAnalyzer
 from PhysicsTools.Heppy.analyzers.AutoHandle import AutoHandle
 from PhysicsTools.Heppy.physicsobjects.DiObject import DiMuon

PhysicsTools/Heppy/python/analyzers/examples/ntuple.py

@@ -1,5 +1,4 @@
 #!/bin/env python
-from __future__ import print_function
 
 def var( tree, varName, type=float ):
     tree.var(varName, type)

PhysicsTools/Heppy/python/analyzers/gen/GeneratorAnalyzer.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from builtins import range
 from PhysicsTools.Heppy.analyzers.core.Analyzer import Analyzer
 from PhysicsTools.Heppy.analyzers.core.AutoHandle import AutoHandle

PhysicsTools/Heppy/python/analyzers/objects/IsoTrackAnalyzer.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import operator
 import itertools
 import copy

PhysicsTools/Heppy/python/analyzers/objects/JetAnalyzer.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from builtins import range
 import math, os
 from PhysicsTools.Heppy.analyzers.core.Analyzer import Analyzer

PhysicsTools/Heppy/python/analyzers/objects/LeptonAnalyzer.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from builtins import range
 from PhysicsTools.Heppy.analyzers.core.Analyzer import Analyzer
 from PhysicsTools.Heppy.analyzers.core.AutoHandle import AutoHandle

PhysicsTools/Heppy/python/analyzers/objects/PhotonAnalyzer.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import operator
 import itertools
 import copy

PhysicsTools/Heppy/python/analyzers/objects/VertexAnalyzer.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import itertools
 
 from PhysicsTools.Heppy.analyzers.core.VertexHistograms import VertexHistograms

PhysicsTools/Heppy/python/loadlibs.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from ROOT import gROOT,gSystem
 
 def load_libs():

PhysicsTools/Heppy/python/physicsobjects/Photon.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from PhysicsTools.Heppy.physicsobjects.PhysicsObject import *
 from math import exp
 import re

PhysicsTools/Heppy/python/physicsutils/BTagSF.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 # importing the python binding to the C++ class from ROOT 
 from ROOT import heppy
 

PhysicsTools/Heppy/python/physicsutils/BTagWeightCalculator.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import ROOT
 import numpy as np
 

PhysicsTools/Heppy/python/physicsutils/EnergyCorrector.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from ROOT import TH1F, TH2F, TFile
 
 

PhysicsTools/Heppy/python/physicsutils/JetReCalibrator.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from builtins import range
 import ROOT
 import os, types

PhysicsTools/Heppy/python/physicsutils/QGLikelihoodCalculator.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from builtins import range
 import ROOT
 import math

PhysicsTools/Heppy/python/physicsutils/TauDecayModes.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 
 class TauDecayModes( object ): 
 

PhysicsTools/Heppy/python/utils/cmsswPreprocessor.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import os 
 import sys                                                              
 import re 

PhysicsTools/Heppy/python/utils/miniAodFiles.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from PhysicsTools.Heppy.utils.cmsswRelease import cmsswRelease, releaseNumber
 
 def miniAodFiles():

PhysicsTools/Heppy/python/utils/rltinfo.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from ROOT import TFile
 from PhysicsTools.HeppyCore.statistics.tree import Tree as Tree
 

PhysicsTools/Heppy/scripts/cmsBatch.py

@@ -2,7 +2,6 @@
 # Colin
 # batch mode for cmsRun, March 2009
 
-from __future__ import print_function
 from builtins import range
 import os, sys,  imp, re, pprint, string, time,shutil,copy,pickle,math
 from optparse import OptionParser

PhysicsTools/Heppy/scripts/cmsStageWithFailover.py

@@ -2,7 +2,6 @@
 
 #this script runs cmsStage multiple times in the case where it failes for some reason
 
-from __future__ import print_function
 from builtins import range
 if __name__ == '__main__':
 

PhysicsTools/Heppy/scripts/heppy_report.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-from __future__ import print_function
 from builtins import range
 from optparse import OptionParser
 import json

PhysicsTools/Heppy/test/crab/heppy_crab_script.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-from __future__ import print_function
 from builtins import range
 import os
 # probably easier to fetch everything without subdirs, but that's up to user preferences

PhysicsTools/Heppy/test/example_autofill_multipleTrees.py

@@ -3,7 +3,6 @@
 # In particular here we create a second tree producer containing only information and then, 
 # cloning it in two copies, we store it both in the same file as the main tree and in separate file
 
-from __future__ import print_function
 import ROOT
 import PhysicsTools.HeppyCore.framework.config as cfg
 # avoid creating subdirs, in case subdirs are wanted the treeProducer should have different names (set name="blabla" in the config)

PhysicsTools/Heppy/test/simple_example_cfg.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import os
 import PhysicsTools.HeppyCore.framework.config as cfg
 from PhysicsTools.Heppy.utils.miniAodFiles import miniAodFiles

PhysicsTools/HeppyCore/python/analyzers/CMSTestAnalyzer.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from PhysicsTools.HeppyCore.framework.analyzer import Analyzer
 
 class CMSTestAnalyzer(Analyzer):

PhysicsTools/HeppyCore/python/analyzers/Printer.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from PhysicsTools.HeppyCore.framework.analyzer import Analyzer
 
 class Printer(Analyzer):

PhysicsTools/HeppyCore/python/framework/analyzer.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 # Copyright (C) 2014 Colin Bernet
 # https://github.com/cbernet/heppy/blob/master/LICENSE
 

PhysicsTools/HeppyCore/python/framework/chain_test.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 import unittest
 import os
 import shutil

PhysicsTools/HeppyCore/python/framework/config.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-from __future__ import absolute_import
 # Copyright (C) 2014 Colin Bernet
 # https://github.com/cbernet/heppy/blob/master/LICENSE
 

PhysicsTools/HeppyCore/python/framework/config_test.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 import unittest
 import os
 import shutil

PhysicsTools/HeppyCore/python/framework/eventsfwlite.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from DataFormats.FWLite import Events as FWLiteEvents
 
 from ROOT import gROOT, gSystem, AutoLibraryLoader

PhysicsTools/HeppyCore/python/framework/eventstfile_test.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 import unittest
 
 from .eventstfile import Events

PhysicsTools/HeppyCore/python/framework/heppy_loop.py

@@ -2,7 +2,6 @@
 # Copyright (C) 2014 Colin Bernet
 # https://github.com/cbernet/heppy/blob/master/LICENSE
 
-from __future__ import print_function
 from builtins import range
 import os
 import shutil

PhysicsTools/HeppyCore/python/framework/looper.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-from __future__ import absolute_import
 # Copyright (C) 2014 Colin Bernet
 # https://github.com/cbernet/heppy/blob/master/LICENSE
 

PhysicsTools/HeppyCore/python/framework/services/service_test.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 import unittest
 import os 
 import shutil

PhysicsTools/HeppyCore/python/framework/weight.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 # Copyright (C) 2014 Colin Bernet
 # https://github.com/cbernet/heppy/blob/master/LICENSE
 

PhysicsTools/HeppyCore/python/statistics/average_test.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 import unittest
 
 from .average import Average

PhysicsTools/HeppyCore/python/statistics/counter_test.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 import unittest
 import os 
 import shutil

PhysicsTools/HeppyCore/python/statistics/tree_test.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 import unittest
 from ROOT import TFile
 from .tree import Tree

PhysicsTools/HeppyCore/python/statistics/value_test.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 import unittest
 import math
 from .value import Value 

PhysicsTools/HeppyCore/python/utils/addToDatasets.py

@@ -2,7 +2,6 @@
 # Colin
 # additional layer, on top of cmsBatch.py
 
-from __future__ import absolute_import
 import os
 
 from .castorBaseDir import getUserAndArea

PhysicsTools/HeppyCore/python/utils/batchmanager.py

@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import print_function
-from __future__ import absolute_import
 from datetime import datetime
 from optparse import OptionParser
 

PhysicsTools/HeppyCore/python/utils/castorBaseDir.py

@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-from __future__ import print_function
-from __future__ import absolute_import
 import os, sys
 from . import eostools as castortools
 

PhysicsTools/HeppyCore/python/utils/das.py

@@ -4,7 +4,6 @@
 """
 DAS command line tool
 """
-from __future__ import print_function
 __author__ = "Valentin Kuznetsov"
 
 import sys

PhysicsTools/HeppyCore/python/utils/dataset.py

@@ -1,7 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
-from __future__ import absolute_import
 from builtins import range
 import os
 import pprint

PhysicsTools/HeppyCore/python/utils/datasetToSource.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 import os
 from .dataset import Dataset, CMSDataset, LocalDataset, createDataset, PrivateDataset, createMyDataset
 

PhysicsTools/HeppyCore/python/utils/dataset_test.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 from builtins import range
 from .dataset import * 
 

PhysicsTools/HeppyCore/python/utils/diclist_test.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 import unittest
 
 from .diclist import diclist

PhysicsTools/HeppyCore/python/utils/edmIntegrityCheck.py

@@ -2,8 +2,6 @@
 """
 Classes to check that a set of ROOT files are OK and publish a report
 """
-from __future__ import print_function
-from __future__ import absolute_import
 
 from builtins import range
 import datetime, fnmatch, json, os, shutil, sys, tempfile, time

PhysicsTools/HeppyCore/python/utils/eostools.py

@@ -2,7 +2,6 @@
 """
 A module to manipulate files on EOS or on the local file system. Intended to have the same interface as castortools.py.
 """
-from __future__ import print_function
 import sys
 import os
 import re

PhysicsTools/HeppyCore/python/utils/logger.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-from __future__ import absolute_import
 from optparse import OptionParser
 import sys,os, re, subprocess, datetime
 

PhysicsTools/HeppyCore/python/utils/production_tasks.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-from __future__ import absolute_import
 
 from builtins import range
 import copy, datetime, inspect, fnmatch, os, re, subprocess, sys, tempfile, time

PhysicsTools/HeppyCore/python/utils/testtree.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from builtins import range
 from ROOT import TFile
 from PhysicsTools.HeppyCore.statistics.tree import Tree