get rid of IntentMismatchError -- if you want that behavior, just don't have any other dispatchers

Author: radix

effect/test_testing.py

@@ -18,7 +18,6 @@
     ESFunc,
     EQDispatcher,
     EQFDispatcher,
-    IntentMismatchError,
     SequenceDispatcher,
     fail_effect,
     resolve_effect,
@@ -285,13 +284,10 @@ class SequenceDispatcherTests(TestCase):
 
     def test_mismatch(self):
         """
-        When an intent isn't expected, a :obj:`IntentMismatchError` is raised.
+        When an intent isn't expected, a :obj:`None` is returned.
         """
         d = SequenceDispatcher([('foo', lambda i: 1 / 0)])
-        e = self.assertRaises(IntentMismatchError,
-                              lambda: sync_perform(d, Effect('hello')))
-        self.assertEqual(e.expected_intent, 'foo')
-        self.assertEqual(e.got_intent, 'hello')
+        self.assertEqual(d('hello'), None)
 
     def test_success(self):
         """

effect/testing.py

@@ -245,14 +245,6 @@ def __call__(self, intent):
                 return sync_performer(lambda d, i: v(i))
 
 
-class IntentMismatchError(Exception):
-    def __init__(self, expected_intent, got_intent):
-        self.expected_intent = expected_intent
-        self.got_intent = got_intent
-        super(IntentMismatchError, self).__init__(
-            'Expected intent %r, got %r' % (expected_intent, got_intent))
-
-
 class SequenceDispatcher(object):
     """
     A dispatcher which steps through a sequence of (intent, func) tuples and
@@ -266,10 +258,6 @@ class SequenceDispatcher(object):
             (MyIntent('a'), lambda i: 'my-intent-result'),
             (OtherIntent('b'), lambda i: 'other-intent-result')
         ])
-
-    Unlike most dispatchers, this one raises an exception
-    (:obj:`IntentMismatchError`) when an intent is not found, in the order
-    expected.
     """
     def __init__(self, sequence):
         """:param list sequence: Sequence of (intent, fn)."""
@@ -280,5 +268,3 @@ def __call__(self, intent):
         if intent == exp_intent:
             self.sequence = self.sequence[1:]
             return sync_performer(lambda d, i: func(i))
-        else:
-            raise IntentMismatchError(exp_intent, intent)