Merge pull request #46769 from smuzaffar/core-py23-compatibility

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

DataFormats/FWLite/test/chainEvent_python.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python3
 
-from __future__ import print_function
 from builtins import range
 from DataFormats.FWLite import Events, Handle
 

DataFormats/FWLite/test/pyroot_multichain.py

@@ -1,5 +1,4 @@
 #! /usr/bin/env python3
-from __future__ import print_function
 import ROOT
 from DataFormats.FWLite import Events, Handle
 import FWCore.ParameterSet.VarParsing as VarParsing

Documentation/DataFormats/python/dataformats.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 
 import cStringIO,operator
 from functools import reduce

Documentation/ReferenceManualScripts/python/MainPageGenerator.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-from __future__ import absolute_import
 import json, urllib2, os, sys
 from bs4 import BeautifulSoup
 

Documentation/ReferenceManualScripts/python/TableParser.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-from __future__ import absolute_import
 # email: [email protected], [email protected]
 
 # please have a look at the namespaces.html (namespace list) and annotated.html

FWCore/Concurrency/scripts/edmStreamStallGrapher.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-from __future__ import print_function
 from builtins import range
 from itertools import groupby
 from operator import attrgetter,itemgetter

FWCore/Framework/test/transition_test_cfg.py

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

FWCore/Integration/python/allowed_cff.py

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

FWCore/Integration/python/forbidden_cff.py

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

FWCore/MessageLogger/scripts/edmFjrDump

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 import xml.etree.ElementTree as ET
 import argparse
 

FWCore/MessageLogger/scripts/edmMLParser

@@ -1,6 +1,5 @@
 #! /usr/bin/env python3
 
-from __future__ import print_function
 
 def manipulate_log(logfile_name,category_names,printBeginEvent,printMessageLabel,verbosityLevel):
 

FWCore/Modules/python/customiseCheckEventSetup.py

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

FWCore/ParameterSet/examples/varParsingExample.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python3
 
-from __future__ import print_function
 from FWCore.ParameterSet.VarParsing import VarParsing
 options = VarParsing ('python')
 options.inputFiles = 'bob','peter'

FWCore/ParameterSet/python/Config.py

@@ -1,8 +1,6 @@
 #!/usr/bin/env python3
 
 ### command line options helper
-from __future__ import print_function
-from __future__ import absolute_import
 import os
 from  .Options import Options
 options = Options()

FWCore/ParameterSet/python/MassReplace.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
 class MassSearchReplaceAnyInputTagVisitor(object):

FWCore/ParameterSet/python/Mixins.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from builtins import range, object
 import inspect
 from typing import Union

FWCore/ParameterSet/python/Modules.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 from .Mixins import _ConfigureComponent, saveOrigin
 from .Mixins import _Unlabelable, _Labelable
 from .Mixins import _TypedParameterizable, _Parameterizable, PrintOptions, specialImportRegistry

FWCore/ParameterSet/python/OrderedSet.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 # The MIT License (MIT)
 #
 # Copyright (c) 19 March 2009 Created by Raymond Hettinger (MIT)

FWCore/ParameterSet/python/SequenceTypes.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 import sys
 
 from builtins import range

FWCore/ParameterSet/python/SequenceVisitors.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 from .SequenceTypes import *
 from .Modules import OutputModule, EDProducer, EDFilter, EDAnalyzer, Service, ESProducer, ESSource, _Module
 from .Mixins import _Labelable

FWCore/ParameterSet/python/TreeCrawler.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 # This CMS code is based on previous work done by Toby Dickenson, as indiciated below
 #
 # for questions: [email protected]

FWCore/ParameterSet/python/Types.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 from .Mixins import PrintOptions, _SimpleParameterTypeBase, _ParameterTypeBase, _Parameterizable, _ConfigureComponent, _Labelable, _TypedParameterizable, _Unlabelable, _modifyParametersFromDict
 from .Mixins import _ValidatingParameterListBase, specialImportRegistry
 from .Mixins import saveOrigin

FWCore/ParameterSet/python/VarParsing.py

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

FWCore/ParameterSet/python/test/MessWithGeometry_cfg.py

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

FWCore/ParameterSet/scripts/edmConfigIncludeChecker

@@ -5,7 +5,6 @@
 #
 # for questions: [email protected]
 
-from __future__ import print_function
 from builtins import object
 import os.path
 import sys

FWCore/ParameterSet/test/cmsconfig.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 #------------------------------------------------------------
 #
 #

FWCore/PythonUtilities/python/XML2Python.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 ## Original version of code heavily based on recipe written by Wai Yip
 ## Tung, released under PSF license.
 ## http://code.activestate.com/recipes/534109/

FWCore/PythonUtilities/scripts/interactivePythonTest.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-from __future__ import print_function
 import sys
 import os
 import readline

FWCore/Services/scripts/edmTracerCompactLogViewer.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-from __future__ import print_function
 from builtins import range
 from itertools import groupby
 from operator import attrgetter,itemgetter

FWCore/Services/scripts/edmTracerLogToSimpleConfig.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 #==============================
 #
 # First argument is a log file from cmsRun

FWCore/Skeletons/python/cms.py

@@ -6,7 +6,6 @@
 Author     : Valentin Kuznetsov <[email protected]>
 Description: CMS-related utils
 """
-from __future__ import print_function
 
 # system modules
 from builtins import range

FWCore/Skeletons/python/main.py

@@ -6,7 +6,6 @@
 Author     : Valentin Kuznetsov <[email protected]>
 Description:
 """
-from __future__ import print_function
 
 # system modules
 import os

FWCore/Skeletons/python/pkg.py

@@ -8,7 +8,6 @@
 Description: AbstractGenerator class provides basic functionality
 to generate CMSSW class from given template
 """
-from __future__ import print_function
 
 # system modules
 import os

FWCore/Skeletons/python/utils.py

@@ -6,7 +6,6 @@
 Author     : Valentin Kuznetsov <[email protected]>
 Description: Utilities module
 """
-from __future__ import print_function
 
 # system modules
 from builtins import range

FWCore/Utilities/python/FileUtils.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import os
 import re
 import pprint as pprint # for testing

IOMC/Input/test/hepmc2gen.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 #!/usr/bin/env cmsRun
 
 ## Original Author: Andrea Carlo Marini

IOMC/RandomEngine/python/RandomServiceHelper.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
 
-from __future__ import print_function
 from FWCore.ParameterSet.Config import Service
 import FWCore.ParameterSet.Types as CfgTypes
 

Utilities/ReleaseScripts/data/edmScanValgrind.py

@@ -1,5 +1,4 @@
 #!/bin/env python
-from __future__ import print_function
 import sys
 
 fileName = sys.argv[1]

Utilities/ReleaseScripts/python/cmsCodeRules/Formatter.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 import os, sys, string
 
 from xml.parsers import expat

Utilities/ReleaseScripts/python/cmsCodeRules/cppFunctionSkipper.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from builtins import range
 __author__="Aurelija"
 __date__ ="$2010-09-23 15.00.20$"

Utilities/ReleaseScripts/python/cmsCodeRules/pickleFileCreater.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 __author__="Aurelija"
 __date__ ="$2010-07-26 12.51.12$"
 

Utilities/ReleaseScripts/python/cmsCodeRules/showPage.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 from builtins import range
 __author__="Aurelija"
 __date__ ="$2010-08-12 10.50.40$"

Utilities/ReleaseScripts/python/commentSkipper/commentSkipper.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 __author__="Aurelija"
 __date__ ="$2010-08-09 14.23.54$"
 

Utilities/ReleaseScripts/scripts/MakeBuildSet

@@ -1,5 +1,4 @@
 #! /usr/bin/env python3
-from __future__ import print_function
 #pylint: disable-msg=W0403
 """
 MakeBuildSet - utilizes dependency discovery mechanism for Partial Releases.

Utilities/ReleaseScripts/scripts/addOnTests.py

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

Utilities/ReleaseScripts/scripts/cmsCodeRulesChecker.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 from builtins import range
 __author__="Aurelija"
 __date__ ="$2010-07-14 16.48.55$"

Utilities/ReleaseScripts/scripts/duplicateReflexLibrarySearch.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python3
 
-from __future__ import print_function
 import optparse
 import os
 import re

Utilities/ReleaseScripts/scripts/storeTreeInfo.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 from builtins import range
 import os, sys, stat
 from operator import itemgetter

Utilities/ReleaseScripts/scripts/ws_sso_content_reader.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 ###Description: The tool reads cern web services behind SSO using user certificates
-from __future__ import print_function
 import os, urllib, urllib2, httplib, cookielib, sys, HTMLParser, re
 from optparse import OptionParser
 

Utilities/StaticAnalyzers/scripts/callgraph.py

@@ -1,5 +1,4 @@
 #! /usr/bin/env python3
-from __future__ import print_function
 import networkx as nx
 import re
 import json

Utilities/StaticAnalyzers/scripts/class-composition.py

@@ -1,5 +1,4 @@
 #! /usr/bin/env python3
-from __future__ import print_function
 import networkx as nx
 import re
 stdcl = re.compile("^std::(.*)[^>]$")

Utilities/StaticAnalyzers/scripts/data-class-funcs.py

@@ -1,5 +1,4 @@
 #! /usr/bin/env python3
-from __future__ import print_function
 import fileinput
 import networkx as nx
 import re

Utilities/StaticAnalyzers/scripts/edm-global-class.py

@@ -1,5 +1,4 @@
 #! /usr/bin/env python3
-from __future__ import print_function
 import fileinput
 import networkx as nx
 import re

Utilities/StaticAnalyzers/scripts/statics.py

@@ -1,5 +1,4 @@
 #! /usr/bin/env python3
-from __future__ import print_function
 import fileinput
 import networkx as nx
 from builtins import range

Utilities/StaticAnalyzers/scripts/symbols.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python3
 
-from __future__ import print_function
 import networkx as nx
 import collections
 import os

Validation/Performance/scripts/cmsSimplememchecker_parser.py

@@ -1,7 +1,6 @@
 #! /usr/bin/env python3
 
 
-from __future__ import print_function
 def manipulate_log(outdir,logfile_name,startevt):
 
     import time

Validation/Performance/scripts/cmsTiming_parser.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python3
 
-from __future__ import print_function
 from builtins import range
 import sys, os
 import time

Validation/Tools/examples/printConversionInfo.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python3
 
-from __future__ import print_function
 import ROOT
 import sys
 from DataFormats.FWLite import Events, Handle

Validation/Tools/python/GenObject.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 ##  Note: Please do not use or modify any data or functions with a
 ##  leading underscore.  If you "mess" with the internal structure,
 ##  the classes may not function as intended.

Validation/Tools/scripts/diffTreeTool.py

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

Validation/Tools/scripts/edmOneToOneComparison.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python3
 
-from __future__ import print_function
 if __name__ == "__main__":
     import optparse
     parser = optparse.OptionParser("usage: %prog [options] config.txt file1.root [file2.root]\nVisit https://twiki.cern.ch/twiki/bin/view/CMS/SWGuidePhysicsToolsEdmOneToOneComparison\nfor full documentation.")

Validation/Tools/scripts/runEdmFileComparison.py

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

Validation/Tools/scripts/simpleEdmComparison.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python3
 
-from __future__ import print_function
 from builtins import range
 import inspect
 import itertools

Validation/Tools/scripts/summarizeEdmComparisonLogfiles.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python3
 
-from __future__ import print_function
 import optparse
 import os
 from glob import glob