move sync_perform to the main module, instead of just testing.

radix · radix · commit d8e5b87fcc93 · 2014-06-08T16:41:58.000-05:00
diff --git a/effect/__init__.py b/effect/__init__.py
@@ -62,6 +62,8 @@
 
 import sys
 
+import six
+
 from functools import wraps
 
 from .continuation import trampoline
@@ -283,3 +285,39 @@ def parallel(effects):
     the same order as the input to this function.
     """
     return Effect(ParallelEffects(list(effects)))
+
+
+class NotSynchronousError(Exception):
+    """Raised when performing an effect wasn't synchronous."""
+
+
+def sync_perform(effect, dispatcher=default_dispatcher):
+    """
+    Perform an effect, and return the value that its last callback or error
+    handler returns. If the final callback raises an exception, the exception
+    will be raised.
+
+    This requires that the effect (and all effects returned from any of its
+    callbacks) to be synchronous -- in other words, the effect performers
+    must pass the result to the box before returning.
+
+    If this is not the case, NotSynchronousError will be raised.
+    """
+    successes = []
+    errors = []
+
+    def success(x):
+        successes.append(x)
+
+    def error(x):
+        errors.append(x)
+
+    effect = effect.on(success=success, error=error)
+    perform(effect, dispatcher=dispatcher)
+    if successes:
+        return successes[0]
+    elif errors:
+        six.reraise(*errors[0])
+    else:
+        raise NotSynchronousError("Performing %r was not synchronous!"
+                                  % (effect,))
diff --git a/effect/test_effect.py b/effect/test_effect.py
@@ -5,8 +5,8 @@
                                 raises, MatchesPredicateWithParams)
 
 from . import (Effect, NoEffectHandlerError, synchronous_performer, perform,
-               default_dispatcher)
-from .testing import StubIntent, sync_perform
+               default_dispatcher, sync_perform)
+from .testing import StubIntent
 
 
 class SelfContainedIntent(object):
diff --git a/effect/testing.py b/effect/testing.py
@@ -6,7 +6,7 @@
 
 import sys
 
-from . import Effect, synchronous_performer, perform, default_dispatcher, guard
+from . import Effect, synchronous_performer, guard
 
 import six
 
@@ -84,34 +84,3 @@ def resolve_stub(effect):
     StubIntent.
     """
     return resolve_effect(effect, effect.intent.result)
-
-
-def sync_perform(effect, dispatcher=default_dispatcher):
-    """
-    Perform an effect, and return the value that its last callback or error
-    handler returns. If the final callback raises an exception, the exception
-    will be raised.
-
-    This requires that the effect (and all effects returned from any of its
-    callbacks) to be synchronous -- in other words, the effect performers
-    must pass the result to the box before returning.
-
-    If this is not the case, an AssertionError will be raised.
-    """
-    successes = []
-    errors = []
-
-    def SUCC(x):
-        successes.append(x)
-
-    def ERR(x):
-        errors.append(x)
-
-    effect = effect.on(success=SUCC, error=ERR)
-    perform(effect, dispatcher=dispatcher)
-    if successes:
-        return successes[0]
-    elif errors:
-        six.reraise(*errors[0])
-    else:
-        raise AssertionError("Performing %r was not synchronous!" % (effect,))
