Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ALCA-DB] py2/3 compatibility:drop use of __future__ #46764

Merged
merged 1 commit into from
Nov 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function
import os
import FWCore.ParameterSet.Config as cms

Expand Down
1 change: 0 additions & 1 deletion Alignment/APEEstimation/test/SkimProducer/startSkim.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function
import sys
sys.path.append("../SkimProducer")
# for switching to CAF queue (condor submit)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function
import configparser as ConfigParser
import argparse
import shelve
Expand Down
1 change: 0 additions & 1 deletion Alignment/APEEstimation/test/autoSubmitter/helpers.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function
import re
import os
import subprocess
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function
import os

import FWCore.ParameterSet.Config as cms
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function
import os

import FWCore.ParameterSet.Config as cms
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function
import os

import FWCore.ParameterSet.Config as cms
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function
########################################################################################
###
### Read and write APEs to and from database and ASCII files
Expand Down
1 change: 0 additions & 1 deletion Alignment/APEEstimation/test/plottingTools/trendPlotter.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function
import ROOT
ROOT.gROOT.SetBatch(True)
from setTDRStyle import setTDRStyle
Expand Down
1 change: 0 additions & 1 deletion Alignment/APEEstimation/test/trackerTreeGenerator_cfg.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function
import FWCore.ParameterSet.Config as cms

import os
Expand Down
2 changes: 0 additions & 2 deletions Alignment/CommonAlignment/python/tools/dataset.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import print_function
from __future__ import absolute_import

import abc
import csv
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function
import sys
import FWCore.ParameterSet.Config as cms

Expand Down
1 change: 0 additions & 1 deletion Alignment/CommonAlignment/python/tools/utilities.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function

def cache(function):
cache = {}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/env python3

from __future__ import print_function
import os
import sys

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/env python3

from __future__ import print_function

from builtins import range
import os
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
# by: $Author: mussgill $
#-----------------------------------------------------

from __future__ import print_function
import re
import json
import os
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
# by: $Author: taroni $
#-----------------------------------------------------

from __future__ import print_function
from xml.dom import minidom
import re
import json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function
from array import array
from copy import copy
from copy import deepcopy
Expand Down
1 change: 0 additions & 1 deletion Alignment/HIPAlignmentAlgorithm/scripts/batchHippy.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/env python3

from __future__ import print_function
import sys
import imp
import copy
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/env python3

from __future__ import print_function

import argparse, contextlib, os, re, shutil, subprocess, tempfile, time

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function
import FWCore.ParameterSet.Config as cms

process = cms.Process("TBDtest")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function
import re

def setup(process, global_tag, zero_tesla=False, geometry=""):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import absolute_import
import FWCore.ParameterSet.Config as cms


Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function
# This Jobdatabas-Class interacts with the mps.db file.
# It's member-variables are often called in the mps_... scripts.
#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function
from builtins import range
import os
import re
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function
##########################################################################
# Classes which are needed by the mps_validate.py file.
##
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/env python3

from __future__ import print_function
import os
import re
import sys
Expand Down
1 change: 0 additions & 1 deletion Alignment/MillePedeAlignmentAlgorithm/scripts/mps_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
#
# It also retirieves number of events from alignment.log and cputime from STDOUT

from __future__ import print_function
from builtins import range
import Alignment.MillePedeAlignmentAlgorithm.mpslib.Mpslibclass as mpslib
import subprocess
Expand Down
1 change: 0 additions & 1 deletion Alignment/MillePedeAlignmentAlgorithm/scripts/mps_fire.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
# mps_fire.py [-a] [-m [-f]] [maxjobs]
# mps_fire.py -h

from __future__ import print_function
from builtins import range
import Alignment.MillePedeAlignmentAlgorithm.mpslib.Mpslibclass as mpslib
import Alignment.MillePedeAlignmentAlgorithm.mpslib.tools as mps_tools
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

M. Schroeder, DESY Hamburg 26-May-2014
"""
from __future__ import print_function

import sys

Expand Down
1 change: 0 additions & 1 deletion Alignment/MillePedeAlignmentAlgorithm/scripts/mps_merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#
# mps_merge.pl [-c] inCfg mergeCfg mergeDir njobs

from __future__ import print_function
from builtins import range
import Alignment.MillePedeAlignmentAlgorithm.mpslib.Mpslibclass as mpslib
import re
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/env python3

from __future__ import print_function
from builtins import range
import os
import subprocess
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#
# Use createChi2ndfplot.C to plot the output of this script.

from __future__ import print_function
import os
import sys
import re
Expand Down
1 change: 0 additions & 1 deletion Alignment/MillePedeAlignmentAlgorithm/scripts/mps_setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/env python3

from __future__ import print_function
from builtins import range
import os
import re
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/env python3

from __future__ import print_function
import os
import sys
import re
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/env python3
from __future__ import print_function
from builtins import range
import re
import argparse
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/env python3
from __future__ import print_function
from builtins import range
import os
import re
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function
##########################################################################
# Creates the TrackerTree.root file.
# Configuration file from TrackerAlignment/test/trackerTreeGenerator_cfg.py
Expand Down
1 change: 0 additions & 1 deletion Alignment/MuonAlignment/python/geometryCSVtoXML.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/usr/bin/env python

# External libraries (standard in Python >= 2.4, at least)
from __future__ import print_function
from sys import stdin
from re import split, sub

Expand Down
1 change: 0 additions & 1 deletion Alignment/MuonAlignment/python/geometryDiff.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/env python

from __future__ import print_function
from builtins import range
from Alignment.MuonAlignment.geometryXMLparser import MuonGeometry, dtorder, cscorder
import sys, getopt
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import absolute_import
import re
from math import *
from .svgfig import rgb, SVG, pathtoPath, load as load_svg
Expand Down
1 change: 0 additions & 1 deletion Alignment/MuonAlignment/python/geometryXMLtoCSV.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
# }

# External libraries (standard in Python >= 2.4, at least)
from __future__ import print_function
from xml.sax import handler, make_parser
from sys import stdin

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function
from builtins import range
from optparse import OptionParser
from random import gauss
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function
import FWCore.ParameterSet.Config as cms
import FWCore.ParameterSet.VarParsing as VarParsing

Expand Down
1 change: 0 additions & 1 deletion Alignment/MuonAlignmentAlgorithms/python/gather_cfg.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function
import os
import FWCore.ParameterSet.Config as cms

Expand Down
1 change: 0 additions & 1 deletion Alignment/MuonAlignmentAlgorithms/scripts/alignCSCRings.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#! /usr/bin/env python3

from __future__ import print_function
import re,os,sys,shutil
import optparse

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#! /usr/bin/env python3

from __future__ import print_function
from builtins import range
import re,os,sys,shutil
import optparse
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function
from builtins import range
mep11angle = 0.002 # guess
mep12angle = 0.002 # guess
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#! /usr/bin/env python3

from __future__ import print_function
import os, sys, optparse, math

prog = sys.argv[0]
Expand Down
1 change: 0 additions & 1 deletion Alignment/MuonAlignmentAlgorithms/scripts/corrVsCorr.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#! /usr/bin/env python3

from __future__ import print_function
from builtins import range
import sys, optparse

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/env python3

from __future__ import print_function
from builtins import range
import os, sys, re, optparse, math

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#! /usr/bin/env python3

from __future__ import print_function
from builtins import range
import os, sys, optparse, math

Expand Down
1 change: 0 additions & 1 deletion Alignment/MuonAlignmentAlgorithms/scripts/createJobs.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#! /usr/bin/env python3

from __future__ import print_function
from builtins import range
import os, sys, optparse, math

Expand Down
1 change: 0 additions & 1 deletion Alignment/MuonAlignmentAlgorithms/scripts/createTree.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#! /usr/bin/env python3

from __future__ import print_function
from builtins import range
import re,os,sys
import optparse
Expand Down
1 change: 0 additions & 1 deletion Alignment/MuonAlignmentAlgorithms/scripts/diffTwoXMLs.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#! /usr/bin/env python3

from __future__ import print_function
import sys, ROOT
ROOT.gROOT.SetBatch(1)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
### also run it with -h option
######################################################

from __future__ import print_function
from builtins import range
import os,sys, DLFCN
import optparse
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#! /usr/bin/env python3

from __future__ import print_function
import sys, ROOT

from geometryDiffVisualization import *
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#! /usr/bin/env python3

from __future__ import print_function
from builtins import range
import re,os,sys,shutil,math
import optparse
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#! /usr/bin/env python3

from __future__ import print_function
from builtins import range
import os, sys, optparse, math, copy
from Alignment.MuonAlignment.geometryXMLparser import MuonGeometry, dtorder, cscorder
Expand Down
1 change: 0 additions & 1 deletion Alignment/MuonAlignmentAlgorithms/scripts/plotscripts.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function
from builtins import range
import ROOT, array, os, re, random
from math import *
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/env python3

from __future__ import print_function
import sys, optparse, re, math
from Alignment.MuonAlignment.geometryXMLparser import MuonGeometry

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#! /usr/bin/env python3

from __future__ import print_function
from builtins import range
import sys, optparse

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function
from fnmatch import fnmatch
import FWCore.ParameterSet.Config as cms
import FWCore.PythonUtilities.LumiList as LumiList
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import print_function
from __future__ import absolute_import

import configparser as ConfigParser
import os
Expand Down
Loading