From d5df1d84fb8721eee8cb84eff81b7f9cb576ae50 Mon Sep 17 00:00:00 2001
From: Luc Papeleux <L.Papeleux@ULiege.be>
Date: Wed, 18 Jan 2023 18:38:10 +0100
Subject: [PATCH] fix capcha in scripts generated by parametricJob.py (comp.py)
& replace execfile(fname) by exec(open(fname).read())
---
parametricJob.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/parametricJob.py b/parametricJob.py
index 95d7d01..3276ad0 100644
--- a/parametricJob.py
+++ b/parametricJob.py
@@ -187,7 +187,7 @@ class ParametricJob(PRMSet):
homeDir=os.getcwd()
# write file
file=open(filename,"w")
- file.write("#!/usr/bin/env python\n")
+ file.write("#!/usr/bin/env python3\n")
file.write("import subprocess, sys\n")
file.write("print 'Copying data from %s local disk started ...'\n"%(nodeHost))
#cpCmd = 'ssh %s \"cp -pRvu %s %s\"' % (nodeHost, localWSpace, homeDir)
@@ -209,7 +209,7 @@ class ParametricJob(PRMSet):
localNodeDir = self.getLocalDiskDir(jobId)
#write file
file=open(filename,"w")
- file.write("#!/usr/bin/env python\n")
+ file.write("#!/usr/bin/env python3\n")
#sshRmCmd = 'ssh %s "rm -rf %s"' % (nodeHost, localNodeDir)
#s="import os; os.system('%s')\n" % sshRmCmd
#file.write(s)
@@ -339,18 +339,18 @@ class ParametricJob(PRMSet):
def atrmScript(self, pid):
filename = "atrm%s.py"%pid
file=open(filename,"w")
- file.write("#!/usr/bin/env python\n")
+ file.write("#!/usr/bin/env python3\n")
file.write("import os\n")
file.write("os.system('atrm %s')\n" % pid)
file.write("if os.path.isfile('kill%s.py'):\n" % pid)
- file.write("\texecfile('kill%s.py')\n" % pid)
+ file.write("\texec(open('kill%s.py').read())\n" % pid)
file.close()
os.chmod(filename,0o700)
def killScript(self, jobId, pid):
filename = "kill%s.py"%jobId
file=open(filename,"w")
- file.write("#!/usr/bin/env python\n")
+ file.write("#!/usr/bin/env python3\n")
s="import os, signal; os.killpg(%d, signal.SIGKILL)\n" % pid
file.write(s)
file.close()
@@ -432,7 +432,7 @@ class ParametricJob(PRMSet):
def qDelScript(self, jobId):
filename = self.qDelScriptName(jobId)
file=open(filename,"w")
- file.write("#!/usr/bin/env python\n")
+ file.write("#!/usr/bin/env python3\n")
file.write("import subprocess, os, sys\n")
file.write("subprocess.call('qdel %s',shell=True)\n"%jobId)
# localDisk Clean
@@ -529,7 +529,7 @@ class ParametricJob(PRMSet):
def sCancelScript(self, jobId):
filename = self.sCancelScriptName(jobId)
file=open(filename,"w")
- file.write("#!/usr/bin/env python\n")
+ file.write("#!/usr/bin/env python3\n")
file.write("import subprocess, os, sys\n")
file.write("subprocess.call('scancel %s',shell=True)\n"%jobId)
# localDisk Clean
@@ -672,7 +672,7 @@ class ParametricJob(PRMSet):
def PBSCancelScript(self, jobId):
filename = self.PBSCancelScriptName(jobId)
file=open(filename,"w")
- file.write("#!/usr/bin/env python\n")
+ file.write("#!/usr/bin/env python3\n")
file.write("import subprocess, os, sys\n")
file.write("subprocess.call('qdel %s',shell=True)\n"%jobId)
# clean qDelScript
--
GitLab