Merge pull request #10348 from mapellidario/19-10143-py2py3

[py2py3] Migration at level scr/python/A/B/C - slice 19

src/python/WMComponent/AgentStatusWatcher/DrainStatusPoller.py

@@ -5,6 +5,8 @@
 """
 from __future__ import division
 
+from future.utils import viewitems
+
 __all__ = []
 
 import logging
@@ -155,7 +157,7 @@ def resetAgentSpeedDrainConfig(self):
         if self.agentConfig.get("SpeedDrainMode"):
             self.agentConfig['SpeedDrainMode'] = False
             speedDrainConfig = self.agentConfig.get("SpeedDrainConfig")
-            for key, v in speedDrainConfig.items():
+            for key, v in viewitems(speedDrainConfig):
                 if key in self.validSpeedDrainConfigKeys and v['Enabled']:
                     speedDrainConfig[key]['Enabled'] = False
 
@@ -179,7 +181,7 @@ def checkSpeedDrainThresholds(self):
             return []
 
         # loop through the speed drain configuration and make a list of what thresholds have been hit
-        for k, v in speedDrainConfig.items():
+        for k, v in viewitems(speedDrainConfig):
             # make sure keys in the speed drain config are valid
             if k in self.validSpeedDrainConfigKeys and isinstance(v['Threshold'], int) and isinstance(v['Enabled'], bool):
                 # we always want to apply the condor priority change if the threshold is hit

src/python/WMComponent/AgentStatusWatcher/ResourceControlUpdater.py

@@ -1,6 +1,8 @@
 """
 Perform cleanup actions
 """
+from __future__ import division
+
 __all__ = []
 
 import logging
@@ -201,8 +203,8 @@ def checkSlotsChanges(self, infoRC, infoSSB):
         for site in set(infoRC).intersection(set(infoSSB)):
             if self.tier0Mode and site.startswith('T1_'):
                 # T1 cores utilization for Tier0
-                infoSSB[site]['slotsCPU'] *= self.t1SitesCores / 100
-                infoSSB[site]['slotsIO'] *= self.t1SitesCores / 100
+                infoSSB[site]['slotsCPU'] *= self.t1SitesCores // 100
+                infoSSB[site]['slotsIO'] *= self.t1SitesCores // 100
             else:
                 # round very small sites to the bare minimum
                 infoSSB[site]['slotsCPU'] = max(infoSSB[site]['slotsCPU'], self.minCPUSlots)

src/python/WMComponent/DBS3Buffer/DBSUploadPoller.py

@@ -24,6 +24,8 @@
 add them, and then add the files.  This is why everything is
 so convoluted.
 """
+from builtins import range
+from future.utils import viewvalues
 from future import standard_library
 standard_library.install_aliases()
 
@@ -445,7 +447,7 @@ def loadFiles(self):
             fileDict = sortListByKey(loadedFiles, 'locations')
 
             # Now add each file
-            for location in fileDict.keys():
+            for location in fileDict:
 
                 files = fileDict.get(location)
 
@@ -492,7 +494,7 @@ def checkBlockCompletion(self):
         Mark Open blocks as Pending if they have timed out or their workflows have completed
         """
         completedWorkflows = self.dbsUtil.getCompletedWorkflows()
-        for block in self.blockCache.values():
+        for block in viewvalues(self.blockCache):
             if block.status == "Open":
                 if (block.getTime() > block.getMaxBlockTime()) or any(
                         key in completedWorkflows for key in block.workflows):
@@ -539,7 +541,7 @@ def getBlock(self, newFile, location, skipOpenCheck=False):
         """
         datasetpath = newFile["datasetPath"]
 
-        for block in self.blockCache.values():
+        for block in viewvalues(self.blockCache):
             if datasetpath == block.getDatasetPath() and location == block.getLocation():
                 if not self.isBlockOpen(newFile=newFile, block=block) and not skipOpenCheck:
                     # Block isn't open anymore.  Mark it as pending so that it gets uploaded.
@@ -587,7 +589,7 @@ def inputBlocks(self):
         createInDBS = []
         createInDBSBuffer = []
         updateInDBSBuffer = []
-        for block in self.blockCache.values():
+        for block in viewvalues(self.blockCache):
             if block.getName() in self.queuedBlocks:
                 # Block is already being dealt with by another process.  We'll
                 # ignore it here.

src/python/WMComponent/JobArchiver/JobArchiverPoller.py

@@ -2,6 +2,8 @@
 """
 The actual jobArchiver algorithm
 """
+from __future__ import division
+
 import logging
 import os
 import os.path

src/python/WMComponent/JobSubmitter/JobSubmitterPoller.py

@@ -8,6 +8,8 @@
 Submit jobs for execution.
 """
 from __future__ import print_function, division
+from builtins import range
+from future.utils import viewitems
 
 import logging
 import os.path
@@ -206,7 +208,7 @@ def addJobsToPackage(self, loadedJob):
         jobPackage[loadedJob["id"]] = loadedJob.getDataStructsJob()
         batchDir = jobPackage['directory']
 
-        if len(jobPackage.keys()) == self.packageSize:
+        if len(jobPackage) == self.packageSize:
             if not os.path.exists(batchDir):
                 os.makedirs(batchDir)
 
@@ -222,7 +224,7 @@ def flushJobPackages(self):
 
         Write any jobs packages to disk that haven't been written out already.
         """
-        workflowNames = self.jobsToPackage.keys()
+        workflowNames = list(self.jobsToPackage)
         for workflowName in workflowNames:
             jobPackage = self.jobsToPackage[workflowName]["package"]
             batchDir = jobPackage['directory']
@@ -452,7 +454,7 @@ def failJobDrain(self, timeNow, possibleLocations):
     def removeAbortedForceCompletedWorkflowFromCache(self):
         abortedAndForceCompleteRequests = self.abortedAndForceCompleteWorkflowCache.getData()
         jobIDsToPurge = set()
-        for jobID, jobInfo in self.jobDataCache.iteritems():
+        for jobID, jobInfo in viewitems(self.jobDataCache):
             if (jobInfo['request_name'] in abortedAndForceCompleteRequests) and \
                     (jobInfo['task_type'] not in ['LogCollect', "Cleanup"]):
                 jobIDsToPurge.add(jobID)
@@ -529,7 +531,7 @@ def getThresholds(self):
 
         rcThresholds = self.resourceControl.listThresholdsForSubmit()
 
-        for siteName in rcThresholds.keys():
+        for siteName in rcThresholds:
             # Add threshold if we don't have it already
             state = rcThresholds[siteName]["state"]
 
@@ -736,7 +738,7 @@ def submitJobs(self, jobsToSubmit):
             logging.debug("There are no packages to submit.")
             return
 
-        for package in jobsToSubmit.keys():
+        for package in jobsToSubmit:
             jobs = jobsToSubmit.get(package, [])
             for job in jobs:
                 job['location'], job['plugin'], job['site_cms_name'] = self.getSiteInfo(job['custom']['location'])
@@ -774,7 +776,7 @@ def getSiteInfo(self, jobSite):
         This is how you get the name of a CE and the plugin for a job
         """
 
-        if jobSite not in self.locationDict.keys():
+        if jobSite not in self.locationDict:
             siteInfo = self.locationAction.execute(siteName=jobSite)
             self.locationDict[jobSite] = siteInfo[0]
         return (self.locationDict[jobSite].get('ce_name'),

src/python/WMCore/WMRuntime/TaskSpace.py

@@ -8,6 +8,7 @@
 
 """
 
+from builtins import object
 import os
 import sys
 import inspect
@@ -31,7 +32,7 @@ def wrapper(self):
         return x(self)
     return wrapper
 
-class TaskSpace:
+class TaskSpace(object):
     """
     _TaskSpace_
 
@@ -118,7 +119,7 @@ def stepSpace(self, stepName):
 
         """
         modName = "WMTaskSpace.%s" % stepName
-        if modName in sys.modules.keys():
+        if modName in sys.modules:
             space = sys.modules[modName]
         else:
             try: