diff --git a/batchoar.py b/batchoar.py index 0f5c442fc88a19185d4781a7636f25c557cac37b..d6397d60e6e00bfba9e844d65b335d0599faec3b 100755 --- a/batchoar.py +++ b/batchoar.py @@ -71,22 +71,22 @@ def load_flags(yaml_flags, args): def load_job(job_name, job, var_names, var_tuples, constants, flags, precommand): for name, value in constants.items(): - job = job.replace(f"${name}$", str(value)) - job_name = job_name.replace(f"${name}$", str(value)) + job = job.replace("${}$".format(name), str(value)) + job_name = job_name.replace("${}$".format(name), str(value)) for flag, str_flag in flags.items(): - job = job.replace(f"@{flag}@", str_flag) - job_name = job_name.replace(f"@{flag}@", str_flag) + job = job.replace("@{}@".format(flag), str_flag) + job_name = job_name.replace("@{}@".format(flag), str_flag) if precommand: - job = f"{precommand} {job}" + job = "{} {}".format(precommand, job) jobs = [] for var_tuple in var_tuples: new_job = job new_job_name = job_name for var_name, var in zip(var_names, var_tuple): - new_job = new_job.replace(f"%{var_name}%", str(var)) - new_job_name = new_job_name.replace(f"%{var_name}%", str(var)) + new_job = new_job.replace("%{}%".format(var_name), str(var)) + new_job_name = new_job_name.replace("%{}%".format(var_name), str(var)) jobs.append((new_job_name, new_job)) return jobs @@ -158,7 +158,7 @@ def main(): elif args.run: logging.warning("Job '{}' didn't return anything...".format(job_name)) else: - fake_id = f"FAKE_ID_{fake_id_counter}" + fake_id = "FAKE_ID_{}".format(fake_id_counter) fake_id_counter += 1 anteriors.appendleft(fake_id)