add support for signals in concurrently

Signed-off-by: Mattias Andrée <maandree@operamail.com>

2 files changed, 14 insertions, 6 deletions

diff --git a/src/join.py b/src/join.py
index 76b7445..d057f90 100644
--- a/src/join.py
+++ b/src/join.py
@@ -217,13 +217,15 @@ def concurrently(*fs):
     '''
     Run a set of functions concurrently and wait for all of them to return
     
-    @param  fs:*()→void  The functions to run
+    @param   fs:*()→(void|join()→...)  The functions to run
+    @return  :list<...>                The return of each functions, assuming it a signal
     '''
-    ts = [threading.Thread(target = f) for f in fs]
-    for t in ts:
-        t.start()
-    for t in ts:
-        t.join()
+    def t(f):
+        thread = threading.Thread(target = f)
+        thread.start()
+        return thread
+    ts = [f() if isinstance(f, signal) or isinstance(f, puresignal) else t(f) for f in fs]
+    return [t.join() for t in ts]
 
 
 
diff --git a/src/test.py b/src/test.py
index 6b4c8af..2538680 100755
--- a/src/test.py
+++ b/src/test.py
@@ -124,6 +124,12 @@ print('  Last (delayed c:a 1 s)')
 print()
 
 
+print('Testing connurrently with @signal and @puresignal')
+concurrently(signal(lambda : c(0)), signal(lambda : c(1)), puresignal(lambda : c(2)), puresignal(lambda : c(3)))
+print('  Last (delayed c:a 1 s)')
+print()
+
+
 @signal
 def fsig1(value):
     pass