From 1fbb16ee4fbc9fe0e8de50bbadbc33a966f65a89 Mon Sep 17 00:00:00 2001 From: Jonas Bardino Date: Mon, 20 Jul 2026 18:20:12 +0200 Subject: [PATCH 1/2] Add missing parentheses in print statements and fix a typo in docstring. Applied on top of #395 with string escape simplifications to limit merge conflicts. --- mig/server/genjobscriptpython.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mig/server/genjobscriptpython.py b/mig/server/genjobscriptpython.py index 5b4168510..62054cc94 100644 --- a/mig/server/genjobscriptpython.py +++ b/mig/server/genjobscriptpython.py @@ -150,9 +150,9 @@ def script_init(self): ''' def print_start(self, name='job'): - """print 'starting new job'""" + """Print 'starting new job'""" - return "print 'Starting new %s with JOB_ID: %s'\n" % \ + return "print('Starting new %s with JOB_ID: %s')\n" % \ (name, self.job_dict['JOB_ID']) def create_files(self, files): @@ -584,7 +584,7 @@ def execute(self, pretext, posttext): for exe in self.job_dict['EXECUTE']: exe = exe.replace('"', '\\"') - cmd += 'print "' + pretext + exe + '"\n' + cmd += 'print("' + pretext + exe + '")\n' cmd += 'if "' + exe + '".find(" >> ") != -1:\n' cmd += ' filehandle = subprocess.Popen("' + exe + ' 2>> ' + \ @@ -599,7 +599,7 @@ def execute(self, pretext, posttext): cmd += 'else:\n' cmd += ' status = "%s" % status\n' cmd += 'status_handle.write("' + exe + ' %s\\n" % status)\n' - cmd += 'print "' + posttext + '%s" % status\n' + cmd += 'print("' + posttext + '%s" % status)\n' cmd += 'status_handle.close()\n' @@ -711,10 +711,10 @@ def print_on_error( successcode='0', msg='ERROR: unexpected exit code!', ): - """Print msg unless last command exitted with successcode""" + """Print msg unless last command exited with successcode""" cmd = 'if ' + result + ' != ' + successcode + ':\n' - cmd += '\tprint "WARNING: ' + msg + "\(\" + " + result + " + \"\)\"\n" + cmd += '\tprint("WARNING: ' + msg + ' (" + ' + result + ' + ")")\n' cmd += '\n' return cmd @@ -751,8 +751,8 @@ def exit_script(self, exitcode='0', name=''): reflected in frontend_script! """ - return 'print "' + name + ' script end reached ' + \ - self.job_dict['JOB_ID'] + '" \nsys.exit(' + exitcode + ')\n' + \ + return 'print("' + name + ' script end reached ' + \ + self.job_dict['JOB_ID'] + '")\nsys.exit(' + exitcode + ')\n' + \ '### END OF SCRIPT ###\n' def clean_up(self): From fae28d0ad629680549f4f6fb7504ceff490c116d Mon Sep 17 00:00:00 2001 From: Jonas Bardino Date: Mon, 20 Jul 2026 18:38:51 +0200 Subject: [PATCH 2/2] Adjust genjobscriptsh similarly to #395 with the string escape simplifications to limit merge conflicts. --- mig/server/genjobscriptsh.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mig/server/genjobscriptsh.py b/mig/server/genjobscriptsh.py index 72df04785..54a7643f9 100644 --- a/mig/server/genjobscriptsh.py +++ b/mig/server/genjobscriptsh.py @@ -1106,7 +1106,7 @@ def print_on_error( """Print msg unless result contains success code""" cmd = 'if [ $' + result + ' -ne ' + successcode + ' ]; then\n' - cmd += '\techo "WARNING: ' + msg + "\($" + result + "\)\"\n" + cmd += '\techo "WARNING: ' + msg + '($' + result + ')"\n' cmd += 'fi\n' return cmd