Merge pull request #84 from atsareg/py3-fixes

[v1r3] Python3 related fixes

Author: Andrei Tsaregorodtsev

src/COMDIRAC/Interfaces/scripts/dchmod.py

@@ -58,11 +58,9 @@ def main():
     import DIRAC
     from DIRAC import gLogger
     from COMDIRAC.Interfaces import DSession
-    from COMDIRAC.Interfaces import DCatalog
     from COMDIRAC.Interfaces import pathFromArgument
 
     session = DSession()
-    catalog = DCatalog()
 
     if len(args) < 2:
         print("Error: not enough arguments provided\n%s:" % Script.scriptName)
@@ -81,7 +79,7 @@ def main():
 
     for lfn in lfns:
         try:
-            pathDict = {lfn: eval("0" + mode)}
+            pathDict = {lfn: int(mode, base=8)}
             result = fc.changePathMode(pathDict, params.recursive)
             if not result["OK"]:
                 gLogger.error("Error:", result["Message"])

src/COMDIRAC/Interfaces/scripts/dkill.py

@@ -67,7 +67,9 @@ def main():
     exitCode = 0
 
     from DIRAC.WorkloadManagementSystem.Client.WMSClient import WMSClient
-    from DIRAC.Core.DISET.RPCClient import RPCClient
+    from DIRAC.WorkloadManagementSystem.Client.JobMonitoringClient import (
+        JobMonitoringClient,
+    )
 
     wmsClient = WMSClient()
 
@@ -79,7 +81,7 @@ def main():
         if result["OK"]:
             userName = result["Value"]
 
-            monitoring = RPCClient("WorkloadManagement/JobMonitoring")
+            monitoring = JobMonitoringClient()
             result = monitoring.getJobs({"Owner": userName})
             if not result["OK"]:
                 print("ERROR:", result["Message"])

src/COMDIRAC/Interfaces/scripts/dlogging.py

@@ -46,14 +46,16 @@ def main():
 
     args = Script.getPositionalArgs()
 
-    from DIRAC.Core.DISET.RPCClient import RPCClient
+    from DIRAC.WorkloadManagementSystem.Client.JobMonitoringClient import (
+        JobMonitoringClient,
+    )
     from COMDIRAC.Interfaces.Utilities.DCommands import ArrayFormatter
 
     exitCode = 0
 
     jobs = map(int, args)
 
-    monitoring = RPCClient("WorkloadManagement/JobMonitoring")
+    monitoring = JobMonitoringClient()
     af = ArrayFormatter(params.getFmt())
     headers = ["Status", "MinorStatus", "ApplicationStatus", "Time", "Source"]
     errors = []

src/COMDIRAC/Interfaces/scripts/dstat.py

@@ -7,16 +7,16 @@
 from __future__ import division
 from __future__ import print_function
 
-__RCSID__ = "$Id$"
-
 from signal import signal, SIGPIPE, SIG_DFL
 import six
 
 from COMDIRAC.Interfaces import ConfigCache
 from DIRAC.Core.Utilities.DIRACScript import DIRACScript as Script
-from DIRAC import S_OK
+from DIRAC import S_OK, S_ERROR
 from DIRAC.Core.Utilities.Time import toString, date, day
-
+from DIRAC.WorkloadManagementSystem.Client.JobMonitoringClient import (
+    JobMonitoringClient,
+)
 from COMDIRAC.Interfaces.Utilities.DCommands import ArrayFormatter
 
 # TODO: how to import job states from JobDB in client installation (lacks MySQLdb module)?
@@ -46,20 +46,18 @@ def selectJobs(owner, date, jobGroup, jobName):
     if jobName:
         conditions["JobName"] = jobName
 
-    monitoring = RPCClient("WorkloadManagement/JobMonitoring")
+    monitoring = JobMonitoringClient()
     result = monitoring.getJobs(conditions, date)
-
     return result
 
 
 def getJobSummary(jobs):
     if not jobs:
         return S_OK({})
-    monitoring = RPCClient("WorkloadManagement/JobMonitoring")
+    monitoring = JobMonitoringClient()
     result = monitoring.getJobsSummary(jobs)
     if not result["OK"]:
         return result
-
     if isinstance(result["Value"], six.string_types):
         try:
             jobSummary = eval(result["Value"])
@@ -98,7 +96,7 @@ class Params(object):
     def __init__(self):
         self.__session = None
         self.user = None
-        self.status = map(lambda e: e.lower(), set(JOB_STATES) - set(JOB_FINAL_STATES))
+        self.status = [e.lower() for e in set(JOB_STATES) - set(JOB_FINAL_STATES)]
         self.fmt = "pretty"
         self.jobDate = 10
         self.fields = DEFAULT_DISPLAY_COLUMNS
@@ -125,7 +123,7 @@ def setStatus(self, arg=None):
         return S_OK()
 
     def setStatusAll(self, arg=None):
-        self.status = map(lambda e: e.lower(), JOB_STATES)
+        self.status = [e.lower() for e in JOB_STATES]
         return S_OK()
 
     def getStatus(self):
@@ -227,9 +225,7 @@ def main():
     args = Script.getPositionalArgs()
 
     import DIRAC
-    from DIRAC import S_OK, S_ERROR
     from DIRAC import exit as DIRACExit
-    from DIRAC.Core.DISET.RPCClient import RPCClient
     from COMDIRAC.Interfaces import DSession
 
     session = DSession()
@@ -299,9 +295,9 @@ def main():
         if "all" in statuses:
             summaries = result["Value"]
         else:
-            for j, s in result["Value"].items():
-                if s["Status"].lower() in statuses:
-                    summaries[j] = s
+            for j in result["Value"]:
+                if result["Value"][j]["Status"].lower() in statuses:
+                    summaries[j] = result["Value"][j]
 
     for s in summaries.values():
         s["JobID"] = int(s["JobID"])

src/COMDIRAC/Interfaces/scripts/dsub.py

@@ -18,24 +18,31 @@
 from DIRAC import S_OK
 from DIRAC import exit as DIRACexit
 from COMDIRAC.Interfaces import ConfigCache
+from COMDIRAC.Interfaces import pathFromArgument
 from DIRAC.Core.Utilities.DIRACScript import DIRACScript as Script
+from DIRAC.Core.Utilities.ClassAd.ClassAdLight import ClassAd
+
+classAdJob = None
 
 
 def parseScriptLinesJDLDirectives(lines):
-    ret = {}
+    result = {}
 
     for l in lines:
         if l.startswith("#JDL "):
             c = l[5:]
             d, v = c.split("=", 1)
-            ret[d.strip()] = v.strip()
-    return ret
+            result[d.strip()] = v.strip()
+    return result
 
 
 def parseScriptJDLDirectives(fn):
-    f = open(fn, "r")
-    lines = f.readlines()
-    f.close()
+    with open(fn, "r") as f:
+        try:
+            lines = f.readlines()
+        except UnicodeDecodeError:
+            # This is a binary executable, no JDL instructions there
+            return {}
 
     return parseScriptLinesJDLDirectives(lines)
 
@@ -49,6 +56,9 @@ def classAdAppendToOutputSandbox(classAd, f):
 
 
 def classAdAppendToSandbox(classAd, f, sbName):
+
+    global classAdJob
+
     sb = []
     if classAd.isAttributeList(sbName):
         sb = classAd.getListFromExpression(sbName)
@@ -328,6 +338,9 @@ def pnumber(start, stop, step, factor):
 
 @Script()
 def main():
+
+    global classAdJob
+
     params = Params()
 
     Script.setUsageMessage(
@@ -405,11 +418,7 @@ def main():
         cmd = args[0]
         cmdArgs = args[1:]
 
-    from DIRAC.Core.Utilities.ClassAd.ClassAdLight import ClassAd
-
     from COMDIRAC.Interfaces import DSession
-    from COMDIRAC.Interfaces import pathFromArgument
-
     from DIRAC.Interfaces.API.Dirac import Dirac
 
     session = DSession()