diff --git a/bin/HWMon/wmcore-SysStat b/bin/HWMon/wmcore-SysStat index 3ffa6ff7fd..8e0e6f01f4 100755 --- a/bin/HWMon/wmcore-SysStat +++ b/bin/HWMon/wmcore-SysStat @@ -5,8 +5,6 @@ wmcore-SysStat Hardware monitoring utility for launched sensor daemons. """ -from __future__ import print_function - import sys import os import getopt diff --git a/bin/adhoc-scripts/ParseSpecCmsswdist.py b/bin/adhoc-scripts/ParseSpecCmsswdist.py index e1dd9cc842..735ae2d252 100644 --- a/bin/adhoc-scripts/ParseSpecCmsswdist.py +++ b/bin/adhoc-scripts/ParseSpecCmsswdist.py @@ -104,7 +104,7 @@ """ -from __future__ import division # Jenkins CI + # Jenkins CI import argparse import os diff --git a/bin/adhoc-scripts/checkDsetFileCount.py b/bin/adhoc-scripts/checkDsetFileCount.py index 18f41111a7..6ce730dce2 100644 --- a/bin/adhoc-scripts/checkDsetFileCount.py +++ b/bin/adhoc-scripts/checkDsetFileCount.py @@ -4,14 +4,12 @@ using both DBS and Rucio services. It prints any inconsistency among those two. """ -from __future__ import print_function, division + import logging import sys from collections import Counter -from future.utils import viewkeys, viewvalues - from WMCore.Services.DBS.DBS3Reader import DBS3Reader from WMCore.Services.Rucio.Rucio import Rucio @@ -95,20 +93,20 @@ def main(): dbsOutput, dbsFilesCounter = getFromDBS(datasetName, logger) logger.info("*** Dataset: %s", datasetName) - logger.info("Rucio file count : %s", sum(viewvalues(rucioOutput))) + logger.info("Rucio file count : %s", sum(rucioOutput.values())) logger.info("DBS file count : %s", dbsFilesCounter['valid'] + dbsFilesCounter['invalid']) logger.info(" - valid files : %s", dbsFilesCounter['valid']) logger.info(" - invalid files : %s", dbsFilesCounter['invalid']) - logger.info("Blocks in Rucio but not in DBS: %s", set(viewkeys(rucioOutput)) - set(viewkeys(dbsOutput))) - logger.info("Blocks in DBS but not in Rucio: %s", set(viewkeys(dbsOutput)) - set(viewkeys(rucioOutput))) + logger.info("Blocks in Rucio but not in DBS: %s", set(rucioOutput.keys()) - set(dbsOutput.keys())) + logger.info("Blocks in DBS but not in Rucio: %s", set(dbsOutput.keys()) - set(rucioOutput.keys())) for blockname in rucioOutput: if blockname not in dbsOutput: logger.error("This block does not exist in DBS: %s", blockname) continue - if rucioOutput[blockname] != sum(viewvalues(dbsOutput[blockname])): + if rucioOutput[blockname] != sum(dbsOutput[blockname].values()): logger.warning("Block with file mismatch: %s", blockname) - logger.warning("\tRucio: %s\t\tDBS: %s", rucioOutput[blockname], sum(viewvalues(dbsOutput[blockname]))) + logger.warning("\tRucio: %s\t\tDBS: %s", rucioOutput[blockname], sum(dbsOutput[blockname].values())) if __name__ == "__main__": diff --git a/bin/adhoc-scripts/checkStuckLQE.py b/bin/adhoc-scripts/checkStuckLQE.py index 07e6cd04d3..2ed77ead52 100644 --- a/bin/adhoc-scripts/checkStuckLQE.py +++ b/bin/adhoc-scripts/checkStuckLQE.py @@ -8,10 +8,9 @@ local workqueue elements and print a summary of work/data location for the elements sitting in the Available status """ -from __future__ import print_function, division + from builtins import next -from future.utils import viewvalues, listvalues import sys import os @@ -58,14 +57,14 @@ def commonDataLocation(element): """ commonLoc = set() if element['PileupData']: - commonLoc = set(next(iter(viewvalues(element['PileupData'])))) + commonLoc = set(next(iter(element['PileupData'].values()))) if element['Inputs']: if commonLoc: - commonLoc = commonLoc & set(next(iter(viewvalues(element['Inputs'])))) + commonLoc = commonLoc & set(next(iter(element['Inputs'].values()))) else: commonLoc = set(list(element['Inputs'].values())[0]) if element['ParentData']: - tempLoc = listvalues(element['ParentData']) + tempLoc = list(element['ParentData'].values()) parentLoc = set(tempLoc[0]) for temp in tempLoc: parentLoc = parentLoc & set(temp) diff --git a/bin/adhoc-scripts/drainAgent.py b/bin/adhoc-scripts/drainAgent.py index 70f307e84c..856c7e8f14 100644 --- a/bin/adhoc-scripts/drainAgent.py +++ b/bin/adhoc-scripts/drainAgent.py @@ -15,10 +15,9 @@ NOTE: you need to source the agent environment: source apps/wmagent/etc/profile.d/init.sh """ -from __future__ import print_function, division + from builtins import range, str, bytes -from future.utils import viewitems import argparse import logging @@ -165,7 +164,7 @@ def getDsetAndWf(lfns, wfsDict): match = [] for dset in uniqDsets: - for wf, values in viewitems(wfsDict): + for wf, values in wfsDict.items(): if dset in values['OutputDatasets']: match.append((wf, values['RequestStatus'], dset)) if match: diff --git a/bin/adhoc-scripts/getWQStatusByWorkflow.py b/bin/adhoc-scripts/getWQStatusByWorkflow.py index 6bd0fc33f2..d158e49018 100644 --- a/bin/adhoc-scripts/getWQStatusByWorkflow.py +++ b/bin/adhoc-scripts/getWQStatusByWorkflow.py @@ -12,7 +12,7 @@ NOTE: you need to source the agent environment: source apps/wmagent/etc/profile.d/init.sh """ -from __future__ import print_function, division + import os import sys diff --git a/bin/adhoc-scripts/parseUnifiedCampaigns.py b/bin/adhoc-scripts/parseUnifiedCampaigns.py index 4e76ac20e6..27ee62b391 100644 --- a/bin/adhoc-scripts/parseUnifiedCampaigns.py +++ b/bin/adhoc-scripts/parseUnifiedCampaigns.py @@ -45,10 +45,9 @@ python parseUnifiedCampaigns.py --fin=wmcore_campaign.json --url=https://alancc7-cloud2.cern.ch/reqmgr2 --verbose=10 --testcamp """ -from __future__ import print_function, division + from builtins import object -from future.utils import viewitems import argparse import json @@ -128,7 +127,7 @@ def getSecondaryAAA(initialValue, uniRecord): * under the secondaries dictionary. If it appears multiple times, we make an OR of the values. """ - for _, innerDict in viewitems(uniRecord.get("secondaries", {})): + for _, innerDict in uniRecord.get("secondaries", {}).items(): if "secondary_AAA" in innerDict: print("Found internal secondary_AAA for campaign: %s" % uniRecord['name']) initialValue = initialValue or innerDict["secondary_AAA"] @@ -161,7 +160,7 @@ def getSecondaryLocation(initialValue, uniRecord): * under the secondaries dictionary. If it appears multiple times, we make an intersection of the values. """ - for _, innerDict in viewitems(uniRecord.get("secondaries", {})): + for _, innerDict in uniRecord.get("secondaries", {}).items(): if "SecondaryLocation" in innerDict: print("Found internal SecondaryLocation for campaign: %s" % uniRecord['name']) initialValue = intersect(initialValue, innerDict["SecondaryLocation"]) @@ -178,7 +177,7 @@ def getSecondaries(initialValue, uniRecord): * taken from the SiteWhitelist key or * taken from the SecondaryLocation one """ - for dset, innerDict in viewitems(uniRecord.get("secondaries", {})): + for dset, innerDict in uniRecord.get("secondaries", {}).items(): print("Found secondaries for campaign: %s" % uniRecord['name']) initialValue[dset] = intersect(innerDict.get("SiteWhitelist", []), innerDict.get("SecondaryLocation", [])) @@ -224,7 +223,7 @@ def parse(istream, verbose=0): conf = dict(confRec) # Set default value from top level campaign configuration # or use the default values defined above - for uniKey, wmKey in viewitems(remap): + for uniKey, wmKey in remap.items(): conf[wmKey] = rec.get(uniKey, conf[wmKey]) conf['SiteWhiteList'] = getSiteList("SiteWhitelist", conf['SiteWhiteList'], rec) @@ -330,7 +329,7 @@ def main(): campData = json.load(istream) if isinstance(campData, dict): # then it's a Unified-like campaign schema - for key, val in viewitems(campData): + for key, val in campData.items(): rec = {'name': key} rec.update(val) data.append(rec) diff --git a/bin/adhoc-scripts/setrequeststatus.py b/bin/adhoc-scripts/setrequeststatus.py index 9b8224ed8c..353f98ea1d 100644 --- a/bin/adhoc-scripts/setrequeststatus.py +++ b/bin/adhoc-scripts/setrequeststatus.py @@ -2,10 +2,7 @@ """ This script can be used to update the status of a request in ReqMgr2. """ -from __future__ import print_function, division -from future import standard_library -standard_library.install_aliases() import http.client import json import os diff --git a/bin/adhoc-scripts/summaryWMStatsFailures.py b/bin/adhoc-scripts/summaryWMStatsFailures.py index 16ef5aa915..24d04a62fb 100644 --- a/bin/adhoc-scripts/summaryWMStatsFailures.py +++ b/bin/adhoc-scripts/summaryWMStatsFailures.py @@ -4,12 +4,7 @@ type of failures, files skipped per agent; as well as an overview of failures per task """ -from __future__ import print_function, division -from future.utils import viewitems - -from future import standard_library -standard_library.install_aliases() import http.client import json import os @@ -47,7 +42,7 @@ def main(): print(" Skipped files: %s" % pformat(data[agent]['skipped'])) print(" Overall agent status:\t\t %s" % data[agent]['status']) - for task, values in viewitems(data[agent]['tasks']): + for task, values in data[agent]['tasks'].items(): if values['jobtype'] not in ['Production', 'Processing', 'Merge', 'Harvest']: # print("Skipping task type %s, for %s" % (values['jobtype'], task)) continue diff --git a/bin/adhoc-scripts/updateTotalStats.py b/bin/adhoc-scripts/updateTotalStats.py index 3dd5851ae3..b1f84ae66f 100644 --- a/bin/adhoc-scripts/updateTotalStats.py +++ b/bin/adhoc-scripts/updateTotalStats.py @@ -109,7 +109,7 @@ def main(): msDbg = MSDbg(msConfig, logger=logger) badWfList = [] - reqList = msDbg.getRequestRecords(reqStatus).values() + reqList = list(msDbg.getRequestRecords(reqStatus).values()) allReqTypes = {req['RequestType'] for req in reqList} logger.info("All possible request types: \n%s", pformat(allReqTypes)) @@ -120,7 +120,7 @@ def main(): for wflow in reqList: # First check if the current workflwo suffers the issue: - if not keySetToCheck < wflow.keys(): + if not keySetToCheck < list(wflow.keys()): # Create a `tmp` key to fill in all the information we'll need in the follwoing steps. wflow['tmp'] = {} diff --git a/bin/check-ACDC-parentage b/bin/check-ACDC-parentage index 916648b2f0..2114dd3a7a 100644 --- a/bin/check-ACDC-parentage +++ b/bin/check-ACDC-parentage @@ -1,18 +1,9 @@ #!/usr/bin/env python -from __future__ import print_function, division -from future import standard_library -standard_library.install_aliases() -from future.utils import viewitems import json -import time import http.client import os -from pprint import pprint -from collections import defaultdict - -from dbs.apis.dbsClient import DbsApi def callRESTAPI(restURL, url="cmsweb.cern.ch"): conn = http.client.HTTPSConnection(url, cert_file=os.getenv('X509_USER_CERT'), @@ -35,7 +26,7 @@ def investigateACDCCollection(workflow): if "rows" in result: if result["rows"]: for row in result["rows"]: - for inFile, value in viewitems(row["doc"]["files"]): + for inFile, value in row["doc"]["files"].items(): if not value["merged"] or value["merged"] == "0": if value["parents"] and "/unmerged/" in value["parents"][0]: missingFiles.add(inFile) diff --git a/bin/check-phedex-dbs-status b/bin/check-phedex-dbs-status index f0c07cea1f..3508d81fce 100755 --- a/bin/check-phedex-dbs-status +++ b/bin/check-phedex-dbs-status @@ -1,5 +1,4 @@ #!/usr/bin/env python -from __future__ import (print_function, division) from WMComponent.DBS3Buffer.DBSBufferUtil import DBSBufferUtil from WMCore.WMInit import connectToDB diff --git a/bin/check-request-wq-status b/bin/check-request-wq-status index 70e602b01f..90ba21a0a4 100755 --- a/bin/check-request-wq-status +++ b/bin/check-request-wq-status @@ -1,7 +1,4 @@ #!/usr/bin/env python -from __future__ import print_function, division - -from future.utils import viewvalues import os from argparse import ArgumentParser @@ -34,14 +31,14 @@ def getAcceptableSites(ele): if ele['Inputs']: if commonSites: - commonSites = commonSites & set([y for x in viewvalues(ele['Inputs']) for y in x]) + commonSites = commonSites & set([y for x in ele['Inputs'].values() for y in x]) else: - commonSites = set([y for x in viewvalues(ele['Inputs']) for y in x]) + commonSites = set([y for x in ele['Inputs'].values() for y in x]) if ele['PileupData']: if commonSites: - commonSites = commonSites & set([y for x in viewvalues(ele['PileupData']) for y in x]) + commonSites = commonSites & set([y for x in ele['PileupData'].values() for y in x]) else: - commonSites = set([y for x in viewvalues(ele['PileupData']) for y in x]) + commonSites = set([y for x in ele['PileupData'].values() for y in x]) return commonSites diff --git a/bin/combineMinifyWMStats.py b/bin/combineMinifyWMStats.py index 31352cf98a..a876874146 100644 --- a/bin/combineMinifyWMStats.py +++ b/bin/combineMinifyWMStats.py @@ -1,4 +1,4 @@ -from __future__ import print_function + from glob import iglob import shutil import os diff --git a/bin/couch_archiver.py b/bin/couch_archiver.py index e83d96ccff..bcc92cf36e 100644 --- a/bin/couch_archiver.py +++ b/bin/couch_archiver.py @@ -4,7 +4,7 @@ Replicate an agent's jobdump to another couch machine. """ -from __future__ import print_function + import os import sys diff --git a/bin/createStoreResults.py b/bin/createStoreResults.py index 4b43a5a3d1..a8692c2387 100644 --- a/bin/createStoreResults.py +++ b/bin/createStoreResults.py @@ -19,11 +19,6 @@ """ -from __future__ import print_function, division - -from future import standard_library -standard_library.install_aliases() - import http.client import json import os diff --git a/bin/dbsbuffer-file-fix.py b/bin/dbsbuffer-file-fix.py index 7453dff3cb..ae5f32ab9b 100644 --- a/bin/dbsbuffer-file-fix.py +++ b/bin/dbsbuffer-file-fix.py @@ -1,15 +1,10 @@ """ """ -from __future__ import print_function - -from future.utils import listvalues import logging import os -import sys import threading -from WMCore.Database.CMSCouch import Database from WMCore.Database.DBFormatter import DBFormatter from WMCore.WMInit import connectToDB @@ -38,7 +33,7 @@ def fixDBSmissingFileAssoc(): print("trimed %s lenth" % len(result)) insertSQL = """INSERT INTO dbsbuffer_file_location (filename, location) VALUES (:fileid, :seid)""" - done = formatter.dbi.processData(insertSQL, listvalues(result)) + done = formatter.dbi.processData(insertSQL, list(result.values())) print("inserted %s" % done) if __name__ == '__main__': diff --git a/bin/fix-dbs-parentage b/bin/fix-dbs-parentage index fe52c0f60a..5c8eb6215e 100755 --- a/bin/fix-dbs-parentage +++ b/bin/fix-dbs-parentage @@ -41,8 +41,6 @@ $manage execute-agent fix-dbs-parentage -p --insert -d /SingleMuon/Run2016D-03Fe """ -from __future__ import print_function, division - from builtins import input import time import datetime diff --git a/bin/inject-to-config-cache b/bin/inject-to-config-cache index 8ceffc2adf..947ead7147 100755 --- a/bin/inject-to-config-cache +++ b/bin/inject-to-config-cache @@ -4,7 +4,6 @@ _inject-to-config-cache_ Add a config and it's meta data to the config cache. """ -from __future__ import print_function import os import sys diff --git a/bin/kill-workflow-in-agent b/bin/kill-workflow-in-agent index e984c2f669..2c752f6f55 100755 --- a/bin/kill-workflow-in-agent +++ b/bin/kill-workflow-in-agent @@ -4,9 +4,9 @@ Script for killing a workflow: delete from LQ, delete in WMBS and set cancelled This has to be executed in each agent the workflow is running in (Agent Level) """ -from __future__ import print_function from builtins import str -import os, sys +import os +import sys from WMCore.Configuration import loadConfigurationFile from WMCore.WorkQueue.WorkQueueBackend import WorkQueueBackend from WMCore.WMInit import connectToDB diff --git a/bin/kill-workflow-in-global b/bin/kill-workflow-in-global index d83c3a8b33..5714cc46c6 100755 --- a/bin/kill-workflow-in-global +++ b/bin/kill-workflow-in-global @@ -10,7 +10,6 @@ This script will mark the global workqueue elements - for a given workflow - as CancelRequested, such that the agents can proceed and acknowledge it, moving elements to status Canceled. """ -from __future__ import print_function import os import sys diff --git a/bin/outputmodules-from-config b/bin/outputmodules-from-config index 7a04d901fa..3105a6f696 100755 --- a/bin/outputmodules-from-config +++ b/bin/outputmodules-from-config @@ -4,10 +4,6 @@ _outputmodules-from-config_ Pull output module metadata from a CMSSW config. """ -from __future__ import print_function - -from future import standard_library -standard_library.install_aliases() import urllib.request import imp diff --git a/bin/paused-jobs b/bin/paused-jobs index a47e73569f..bae7b7c17f 100755 --- a/bin/paused-jobs +++ b/bin/paused-jobs @@ -1,5 +1,4 @@ #!/usr/bin/env python -from __future__ import print_function from builtins import input, object diff --git a/bin/purgeDeletedCouchDoc.py b/bin/purgeDeletedCouchDoc.py index db83a8cd24..798446c5d1 100644 --- a/bin/purgeDeletedCouchDoc.py +++ b/bin/purgeDeletedCouchDoc.py @@ -1,4 +1,4 @@ -from __future__ import print_function + from argparse import ArgumentParser diff --git a/bin/reqmgr-put-default-config b/bin/reqmgr-put-default-config index 6045af02d2..19f38f2ec0 100755 --- a/bin/reqmgr-put-default-config +++ b/bin/reqmgr-put-default-config @@ -7,9 +7,6 @@ documents in the ReqMgr Auxiliary DB. It's supposed to be called at every ReqMgr2 deployment, such that the splitting, permissions, etc are always up-to-date """ -from __future__ import print_function, division -from future import standard_library -standard_library.install_aliases() import http.client import json diff --git a/bin/reqmgr-sw-update b/bin/reqmgr-sw-update index 6af7449e83..ecc562c82b 100755 --- a/bin/reqmgr-sw-update +++ b/bin/reqmgr-sw-update @@ -12,7 +12,6 @@ to retrieve data asynchronously into a private ReqMgr database. Rather than consult TC at every request injection. """ -from __future__ import print_function import sys import os diff --git a/bin/vaildateCMSSWMergeVersion b/bin/vaildateCMSSWMergeVersion index 3c45736dd0..402602d5db 100644 --- a/bin/vaildateCMSSWMergeVersion +++ b/bin/vaildateCMSSWMergeVersion @@ -1,8 +1,5 @@ #!/usr/bin/env python -from __future__ import (division, print_function) - from builtins import range, str, bytes -from future.utils import viewitems from pprint import pprint from WMCore.WMSpec.WMWorkload import WMWorkloadHelper @@ -23,7 +20,7 @@ print("List of tasks which merge task has different cmssw versions than processi print("NOVERSION could mean it is defined in workflow level not task level. so not necessary error case") print("Request Name | status | task name | correct cmssw vereion | current merge cmssw version") for item in r: - for req, reqInfo in viewitems(item): + for req, reqInfo in item.items(): cmssw = reqInfo.get("CMSSWVersion", []) status = reqInfo.get("RequestStatus", []) if not isinstance(cmssw, (str, bytes)) and len(cmssw) > 1: diff --git a/bin/wmagent-couchapp-init b/bin/wmagent-couchapp-init index 36e5ed9f4c..a3617664e2 100755 --- a/bin/wmagent-couchapp-init +++ b/bin/wmagent-couchapp-init @@ -3,11 +3,6 @@ wmagent-couchapp-init """ -from __future__ import print_function, division - -from future import standard_library - -standard_library.install_aliases() import argparse import os diff --git a/bin/wmagent-delete-couchdb-workflow b/bin/wmagent-delete-couchdb-workflow index 746259a909..e8a8271483 100755 --- a/bin/wmagent-delete-couchdb-workflow +++ b/bin/wmagent-delete-couchdb-workflow @@ -1,5 +1,4 @@ #!/usr/bin/env python -from __future__ import print_function from builtins import input diff --git a/bin/wmagent-mod-config b/bin/wmagent-mod-config index 30dc9b1b04..da941f1c4b 100755 --- a/bin/wmagent-mod-config +++ b/bin/wmagent-mod-config @@ -9,10 +9,6 @@ Copyright (c) 2011 Fermilab. All rights reserved. Note: this script is also used by ASO deployment, see: https://github.com/dmwm/deployment/blob/master/asyncstageout/manage#L246 """ -from __future__ import print_function -from future import standard_library -standard_library.install_aliases() -from future.utils import viewitems import getopt import imp @@ -81,7 +77,7 @@ def modifyConfiguration(config, **args): "working_dir": [("General", "workDir")], } - for k, v in viewitems(args): + for k, v in args.items(): parameters = mapping.get(k, []) for p in parameters: if hasattr(config, p[0]): diff --git a/bin/wmagent-resource-control b/bin/wmagent-resource-control index 6f64afd965..e979b73e94 100755 --- a/bin/wmagent-resource-control +++ b/bin/wmagent-resource-control @@ -4,9 +4,6 @@ wmagent-resource-control Utility script for manipulating resource control. """ -from __future__ import print_function - -from future.utils import viewitems import os import sys @@ -189,7 +186,7 @@ def printThresholds(resourceControl, desiredSiteName): print("%s - %d running, %d pending, %d running slots total, %d pending slots total%s:" % ( siteName, runningJobs, pendingJobs, runningSlots, pendingSlots, stateMsg)) - for task, thres in viewitems(siteThresholds['thresholds']): + for task, thres in siteThresholds['thresholds'].items(): print(" %s - %d running, %d pending, %d max running, %d max pending, priority %s" % (task, thres["task_running_jobs"], thres['task_pending_jobs'], thres["max_slots"], thres["pending_slots"], str(thres.get("priority", 1)))) diff --git a/bin/wmagent-unregister-wmstats b/bin/wmagent-unregister-wmstats index 38e07670f5..c9a4d9a385 100755 --- a/bin/wmagent-unregister-wmstats +++ b/bin/wmagent-unregister-wmstats @@ -1,5 +1,4 @@ #!/usr/bin/env python -from __future__ import print_function from builtins import input import os diff --git a/bin/wmagent-upload-config b/bin/wmagent-upload-config index 011596ba8c..29a1b84c0c 100755 --- a/bin/wmagent-upload-config +++ b/bin/wmagent-upload-config @@ -1,5 +1,4 @@ #!/usr/bin/env python -from __future__ import division, print_function import os import sys diff --git a/bin/wmagent-workqueue b/bin/wmagent-workqueue index 9a8c8072a8..472e9da107 100755 --- a/bin/wmagent-workqueue +++ b/bin/wmagent-workqueue @@ -4,7 +4,6 @@ wmagent-workqueue Utility script for manipulating workqueue. """ -from __future__ import print_function import os import sys diff --git a/bin/wmcore-db-init b/bin/wmcore-db-init index ff5c9f1590..4ce72beaa0 100755 --- a/bin/wmcore-db-init +++ b/bin/wmcore-db-init @@ -3,7 +3,6 @@ Commands for initializing the proper database tables or cleaning the database. """ -from __future__ import print_function from builtins import input diff --git a/bin/wmcore-new-config b/bin/wmcore-new-config index 13df57338f..4559aa4017 100755 --- a/bin/wmcore-new-config +++ b/bin/wmcore-new-config @@ -7,8 +7,6 @@ directory. This command retrieves all of them and merges them together into one big configuration file that operators can then edit. """ -from __future__ import print_function - __revision__ = "$Id: wmcore-new-config,v 1.5 2010/01/22 22:08:32 sryu Exp $" __version__ = "$Revision: 1.5 $" __author__ = "fvlingen@caltech.edu" diff --git a/bin/wmcore-new-flow b/bin/wmcore-new-flow index 4a7425b6f7..5de490d6ea 100755 --- a/bin/wmcore-new-flow +++ b/bin/wmcore-new-flow @@ -4,7 +4,6 @@ Generates components, handlers and threadpools from a specification. It sets up the skeleton for development. """ -from __future__ import print_function __revision__ = "$Id: wmcore-new-flow,v 1.1 2009/01/14 12:31:22 fvlingen Exp $" __version__ = "$Revision: 1.1 $" diff --git a/bin/wmcoreD b/bin/wmcoreD index e8e9e866f7..40c773adb5 100755 --- a/bin/wmcoreD +++ b/bin/wmcoreD @@ -28,7 +28,6 @@ wmcoreD --restart --config=WMCoreConfig.py wmcoreD --shutdown --config=WMCoreConfig.py --cleanup-all """ -from __future__ import print_function from builtins import str __revision__ = "$Id: wmcoreD,v 1.16 2010/05/26 21:09:35 sfoulkes Exp $"