aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xsrc/test.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/test.py b/src/test.py
index 125d979..2190451 100755
--- a/src/test.py
+++ b/src/test.py
@@ -44,12 +44,14 @@ class joinable:
self.condition.release()
-def join(f):
- f.condition.acquire()
- f.condition.wait()
- (jargs, jkwargs) = f.queue.pop(0)
- f.condition.release()
- return (jargs, jkwargs)
+def join(*fs):
+ rc = []
+ for f in fs:
+ f.condition.acquire()
+ f.condition.wait()
+ rc.append(f.queue.pop(0))
+ f.condition.release()
+ return rc[0] if len(fs) == 1 else rc
class test: