signal => puresignal, fsignal => signal

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

2 files changed, 12 insertions, 12 deletions

diff --git a/src/join.py b/src/join.py
index a79d32c..355c27b 100644
--- a/src/join.py
+++ b/src/join.py
@@ -21,7 +21,7 @@ import random
 import threading
 
 
-class signal:
+class puresignal:
     '''
     Function decorator for signals, functions that run asynchronously
     '''
@@ -104,9 +104,9 @@ class fragment:
 
 
 
-class fsignal(fragment):
+class signal(fragment):
     '''
-    Shorthand for @fragment @signal
+    Shorthand for @fragment @puresignal
     '''
     def __init__(self, f):
         '''
@@ -114,7 +114,7 @@ class fsignal(fragment):
         
         @param  f:(...)→¿R?  The decorated function
         '''
-        fragment.__init__(self, signal(f))
+        fragment.__init__(self, puresignal(f))
 
 
 
diff --git a/src/test.py b/src/test.py
index a0125df..8f381bf 100755
--- a/src/test.py
+++ b/src/test.py
@@ -67,7 +67,7 @@ print([ordered() for _ in range(100)])
 print()
 
 
-@signal
+@puresignal
 def sig():
     time.sleep(0.25)
     print('  first')
@@ -82,17 +82,17 @@ print()
 
 
 @fragment
-@signal
+@puresignal
 def fsig1(value):
     pass
 
 @fragment
-@signal
+@puresignal
 def fsig2(value):
     pass
 
 @fragment
-@signal
+@puresignal
 def fsig3(value):
     pass
 
@@ -124,15 +124,15 @@ print('  Last (delayed c:a 1 s)')
 print()
 
 
-@fsignal
+@signal
 def fsig1(value):
     pass
 
-@fsignal
+@signal
 def fsig2(value):
     pass
 
-@fsignal
+@signal
 def fsig3(value):
     pass
 
@@ -147,7 +147,7 @@ def unjoining(index):
     print(' ', *jargs)
     time.sleep(0.25)
 
-print('Testing @fsignal, expecting 1,2,1')
+print('Testing @signal, expecting 1,2,1')
 unjoining(0)
 unjoining(1)
 unjoining(2)