From 67b37e790271dc029f0adacbb97a4f126ffdf134 Mon Sep 17 00:00:00 2001
From: Michiel Cottaar <MichielCottaar@gmail.com>
Date: Fri, 29 Mar 2019 09:49:50 +0000
Subject: [PATCH] ENH: allow potentially nested tuple of job ids in wait()
---
fsl/utils/fslsub.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/fsl/utils/fslsub.py b/fsl/utils/fslsub.py
index d679a3a3a..713826a8c 100644
--- a/fsl/utils/fslsub.py
+++ b/fsl/utils/fslsub.py
@@ -202,10 +202,8 @@ def wait(job_ids):
:arg job_ids: string or tuple of strings with jobs that should finish
before continuing
"""
- if isinstance(job_ids, string_types):
- job_ids = (job_ids, )
start_time = time.time()
- for job_id in job_ids:
+ for job_id in _flatten_job_ids(job_ids):
log.debug('Waiting for job {}'.format(job_id))
while len(info(job_id)) > 0:
wait_time = min(max(1, (time.time() - start_time) / 3.), 20)
--
GitLab