Renaming emit to dispatch & execute to implement

cloudbridge/cloud/base/events.py

@@ -32,7 +32,7 @@ def observe(event_pattern, priority):
     return deco
 
 
-def execute(event_pattern, priority):
+def implement(event_pattern, priority):
     def deco(f):
         # Mark function as having an event_handler so we can discover it
         # The callback cannot be set to f as it is not bound yet and will be
@@ -207,12 +207,12 @@ class SimpleEventDispatcher(EventDispatcher):
         self.subscribe(handler)
         return handler
 
-    def execute(self, event_pattern, priority, callback):
+    def implement(self, event_pattern, priority, callback):
         handler = ExecutingEventHandler(event_pattern, priority, callback)
         self.subscribe(handler)
         return handler
 
-    def emit(self, sender, event, *args, **kwargs):
+    def dispatch(self, sender, event, *args, **kwargs):
         handlers = self.get_handlers_for_event(event)
 
         if handlers:

cloudbridge/cloud/base/services.py

@@ -4,7 +4,7 @@ Base implementation for services available through a provider
 import logging
 
 import cloudbridge.cloud.base.helpers as cb_helpers
-from cloudbridge.cloud.base.events import execute
+from cloudbridge.cloud.base.events import implement
 from cloudbridge.cloud.base.resources import BaseBucket
 from cloudbridge.cloud.base.resources import BaseNetwork
 from cloudbridge.cloud.base.resources import BaseRouter
@@ -53,7 +53,7 @@ class BaseCloudService(CloudService):
         return self._provider
 
     def emit(self, sender, event, *args, **kwargs):
-        return self._provider.events.emit(sender, event, *args, **kwargs)
+        return self._provider.events.dispatch(sender, event, *args, **kwargs)
 
     def _generate_event_pattern(self, func_name):
         return ".".join((self._service_event_pattern, func_name))
@@ -66,11 +66,11 @@ class BaseCloudService(CloudService):
         event_pattern = self._generate_event_pattern(func_name)
         self.provider.events.intercept(event_pattern, priority, callback)
 
-    def execute_function(self, func_name, priority, callback):
+    def implement_function(self, func_name, priority, callback):
         event_pattern = self._generate_event_pattern(func_name)
-        self.provider.events.execute(event_pattern, priority, callback)
+        self.provider.events.implement(event_pattern, priority, callback)
 
-    def emit_function(self, sender, func_name, *args, **kwargs):
+    def dispatch_function(self, sender, func_name, *args, **kwargs):
         """
         Emits the event corresponding to the given function name for the
         current service
@@ -84,8 +84,8 @@ class BaseCloudService(CloudService):
         :return:  The return value resulting from the handler chain invocations
         """
         full_event_name = self._generate_event_pattern(func_name)
-        return self._provider.events.emit(sender, full_event_name,
-                                          *args, **kwargs)
+        return self._provider.events.dispatch(sender, full_event_name,
+                                              *args, **kwargs)
 
 
 class BaseSecurityService(SecurityService, BaseCloudService):
@@ -173,8 +173,8 @@ class BaseBucketService(
 
     # Generic find will be used for providers where we have not implemented
     # provider-specific querying for find method
-    @execute(event_pattern="*.storage.buckets.find",
-             priority=BaseCloudService.STANDARD_EVENT_PRIORITY)
+    @implement(event_pattern="*.storage.buckets.find",
+               priority=BaseCloudService.STANDARD_EVENT_PRIORITY)
     def _find(self, **kwargs):
         obj_list = self
         filters = ['name']
@@ -202,20 +202,20 @@ class BaseBucketService(
                   the bucket's provider-specific CloudBridge object is
                   returned if the bucket is found.
         """
-        return self.emit_function(self, "get", bucket_id)
+        return self.dispatch_function(self, "get", bucket_id)
 
     def find(self, **kwargs):
         """
         Returns a list of buckets filtered by the given keyword arguments.
         Accepted search arguments are: 'name'
         """
-        return self.emit_function(self, "find", **kwargs)
+        return self.dispatch_function(self, "find", **kwargs)
 
     def list(self, limit=None, marker=None):
         """
         List all buckets.
         """
-        return self.emit_function(self, "list", limit=limit, marker=marker)
+        return self.dispatch_function(self, "list", limit=limit, marker=marker)
 
     def create(self, name, location=None):
         """
@@ -229,7 +229,7 @@ class BaseBucketService(
         :return:  The created bucket's provider-specific CloudBridge object.
         """
         BaseBucket.assert_valid_resource_name(name)
-        return self.emit_function(self, "create", name, location=location)
+        return self.dispatch_function(self, "create", name, location=location)
 
     def delete(self, bucket_id):
         """
@@ -238,7 +238,7 @@ class BaseBucketService(
         :type bucket_id: str
         :param bucket_id: The ID of the bucket to be deleted.
         """
-        return self.emit_function(self, "delete", bucket_id)
+        return self.dispatch_function(self, "delete", bucket_id)
 
 
 class BaseBucketObjectService(

cloudbridge/cloud/interfaces/events.py

@@ -93,7 +93,7 @@ class EventDispatcher(object):
         pass
 
     @abstractmethod
-    def emit(self, sender, event, *args, **kwargs):
+    def dispatch(self, sender, event, *args, **kwargs):
         """
         Raises an event, which will trigger all handlers that are registered
         for this event. The return value of the emit function is the return

cloudbridge/cloud/providers/aws/services.py

@@ -10,7 +10,7 @@ import cachetools
 import requests
 
 import cloudbridge.cloud.base.helpers as cb_helpers
-from cloudbridge.cloud.base.events import execute
+from cloudbridge.cloud.base.events import implement
 from cloudbridge.cloud.base.resources import ClientPagedResultList
 from cloudbridge.cloud.base.services import BaseBucketObjectService
 from cloudbridge.cloud.base.services import BaseBucketService
@@ -309,8 +309,8 @@ class AWSBucketService(BaseBucketService):
                                  cb_resource=AWSBucket,
                                  boto_collection_name='buckets')
 
-    @execute(event_pattern="aws.storage.buckets.get",
-             priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
+    @implement(event_pattern="aws.storage.buckets.get",
+               priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _get(self, bucket_id):
         """
         Returns a bucket given its ID. Returns ``None`` if the bucket
@@ -339,13 +339,13 @@ class AWSBucketService(BaseBucketService):
         # For all other responses, it's assumed that the bucket does not exist.
         return None
 
-    @execute(event_pattern="aws.storage.buckets.list",
-             priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
+    @implement(event_pattern="aws.storage.buckets.list",
+               priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _list(self, limit, marker):
         return self.svc.list(limit=limit, marker=marker)
 
-    @execute(event_pattern="aws.storage.buckets.create",
-             priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
+    @implement(event_pattern="aws.storage.buckets.create",
+               priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _create(self, name, location):
         AWSBucket.assert_valid_resource_name(name)
         location = location or self.provider.region_name
@@ -379,8 +379,8 @@ class AWSBucketService(BaseBucketService):
                 else:
                     raise
 
-    @execute(event_pattern="aws.storage.buckets.delete",
-             priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
+    @implement(event_pattern="aws.storage.buckets.delete",
+               priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _delete(self, bucket_id):
         bucket = self._get(bucket_id)
         if bucket:

cloudbridge/cloud/providers/azure/services.py

@@ -8,7 +8,7 @@ from azure.mgmt.compute.models import DiskCreateOption
 from msrestazure.azure_exceptions import CloudError
 
 import cloudbridge.cloud.base.helpers as cb_helpers
-from cloudbridge.cloud.base.events import execute
+from cloudbridge.cloud.base.events import implement
 from cloudbridge.cloud.base.resources import ClientPagedResultList
 from cloudbridge.cloud.base.resources import ServerPagedResultList
 from cloudbridge.cloud.base.services import BaseBucketObjectService
@@ -396,8 +396,8 @@ class AzureBucketService(BaseBucketService):
     def __init__(self, provider):
         super(AzureBucketService, self).__init__(provider)
 
-    @execute(event_pattern="azure.storage.buckets.get",
-             priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
+    @implement(event_pattern="azure.storage.buckets.get",
+               priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _get(self, bucket_id):
         """
         Returns a bucket given its ID. Returns ``None`` if the bucket
@@ -410,16 +410,16 @@ class AzureBucketService(BaseBucketService):
             log.exception(error)
             return None
 
-    @execute(event_pattern="azure.storage.buckets.list",
-             priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
+    @implement(event_pattern="azure.storage.buckets.list",
+               priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _list(self, limit, marker):
         buckets = [AzureBucket(self.provider, bucket)
                    for bucket in self.provider.azure_client.list_containers()]
         return ClientPagedResultList(self.provider, buckets,
                                      limit=limit, marker=marker)
 
-    @execute(event_pattern="azure.storage.buckets.create",
-             priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
+    @implement(event_pattern="azure.storage.buckets.create",
+               priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _create(self, name, location=None):
         """
         Create a new bucket.
@@ -428,8 +428,8 @@ class AzureBucketService(BaseBucketService):
         bucket = self.provider.azure_client.create_container(name)
         return AzureBucket(self.provider, bucket)
 
-    @execute(event_pattern="azure.storage.buckets.delete",
-             priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
+    @implement(event_pattern="azure.storage.buckets.delete",
+               priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _delete(self, bucket_id):
         """
         Delete this bucket.

cloudbridge/cloud/providers/gce/services.py

@@ -8,7 +8,7 @@ import googleapiclient
 
 import cloudbridge as cb
 from cloudbridge.cloud.base import helpers as cb_helpers
-from cloudbridge.cloud.base.events import execute
+from cloudbridge.cloud.base.events import implement
 from cloudbridge.cloud.base.resources import ClientPagedResultList
 from cloudbridge.cloud.base.resources import ServerPagedResultList
 from cloudbridge.cloud.base.services import BaseBucketService
@@ -1131,8 +1131,8 @@ class GCSBucketService(BaseBucketService):
     def __init__(self, provider):
         super(GCSBucketService, self).__init__(provider)
 
-    @execute(event_pattern="gce.storage.buckets.get",
-             priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
+    @implement(event_pattern="gce.storage.buckets.get",
+               priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _get(self, bucket_id):
         """
         Returns a bucket given its ID. Returns ``None`` if the bucket
@@ -1142,8 +1142,8 @@ class GCSBucketService(BaseBucketService):
         bucket = self.provider.get_resource('buckets', bucket_id)
         return GCSBucket(self.provider, bucket) if bucket else None
 
-    @execute(event_pattern="gce.storage.buckets.find",
-             priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
+    @implement(event_pattern="gce.storage.buckets.find",
+               priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _find(self, name, limit=None, marker=None):
         """
         Searches in bucket names for a substring.
@@ -1152,8 +1152,8 @@ class GCSBucketService(BaseBucketService):
         return ClientPagedResultList(self.provider, buckets, limit=limit,
                                      marker=marker)
 
-    @execute(event_pattern="gce.storage.buckets.list",
-             priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
+    @implement(event_pattern="gce.storage.buckets.list",
+               priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _list(self, limit=None, marker=None):
         """
         List all containers.
@@ -1176,8 +1176,8 @@ class GCSBucketService(BaseBucketService):
                                      response.get('nextPageToken'),
                                      False, data=buckets)
 
-    @execute(event_pattern="gce.storage.buckets.create",
-             priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
+    @implement(event_pattern="gce.storage.buckets.create",
+               priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _create(self, name, location=None):
         GCSBucket.assert_valid_resource_name(name)
         body = {'name': name}
@@ -1203,8 +1203,8 @@ class GCSBucketService(BaseBucketService):
             else:
                 raise
 
-    @execute(event_pattern="gce.storage.buckets.delete",
-             priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
+    @implement(event_pattern="gce.storage.buckets.delete",
+               priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _delete(self, bucket_id):
         """
         Delete this bucket.

cloudbridge/cloud/providers/openstack/services.py

@@ -15,7 +15,7 @@ from openstack.exceptions import ResourceNotFound
 from swiftclient import ClientException as SwiftClientException
 
 import cloudbridge.cloud.base.helpers as cb_helpers
-from cloudbridge.cloud.base.events import execute
+from cloudbridge.cloud.base.events import implement
 from cloudbridge.cloud.base.resources import BaseLaunchConfig
 from cloudbridge.cloud.base.resources import ClientPagedResultList
 from cloudbridge.cloud.base.services import BaseBucketObjectService
@@ -411,8 +411,8 @@ class OpenStackBucketService(BaseBucketService):
     def __init__(self, provider):
         super(OpenStackBucketService, self).__init__(provider)
 
-    @execute(event_pattern="openstack.storage.buckets.get",
-             priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
+    @implement(event_pattern="openstack.storage.buckets.get",
+               priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _get(self, bucket_id):
         """
         Returns a bucket given its ID. Returns ``None`` if the bucket
@@ -428,8 +428,8 @@ class OpenStackBucketService(BaseBucketService):
             log.debug("Bucket %s was not found.", bucket_id)
             return None
 
-    @execute(event_pattern="openstack.storage.buckets.find",
-             priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
+    @implement(event_pattern="openstack.storage.buckets.find",
+               priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _find(self, **kwargs):
         name = kwargs.pop('name', None)
 
@@ -443,8 +443,8 @@ class OpenStackBucketService(BaseBucketService):
                       if name in c.get("name")]
         return oshelpers.to_server_paged_list(self.provider, cb_buckets)
 
-    @execute(event_pattern="openstack.storage.buckets.list",
-             priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
+    @implement(event_pattern="openstack.storage.buckets.list",
+               priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _list(self, limit, marker):
         _, container_list = self.provider.swift.get_account(
             limit=oshelpers.os_result_limit(self.provider, limit),
@@ -453,8 +453,8 @@ class OpenStackBucketService(BaseBucketService):
                       for c in container_list]
         return oshelpers.to_server_paged_list(self.provider, cb_buckets, limit)
 
-    @execute(event_pattern="openstack.storage.buckets.create",
-             priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
+    @implement(event_pattern="openstack.storage.buckets.create",
+               priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _create(self, name, location):
         OpenStackBucket.assert_valid_resource_name(name)
         location = location or self.provider.region_name
@@ -466,8 +466,8 @@ class OpenStackBucketService(BaseBucketService):
             self.provider.swift.put_container(name)
             return self.get(name)
 
-    @execute(event_pattern="openstack.storage.buckets.delete",
-             priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
+    @implement(event_pattern="openstack.storage.buckets.delete",
+               priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _delete(self, bucket_id):
         self.provider.swift.delete_container(bucket_id)
 

test/test_event_system.py

@@ -9,7 +9,7 @@ class EventSystemTestCase(unittest.TestCase):
 
     def test_emit_event_no_handlers(self):
         dispatcher = SimpleEventDispatcher()
-        result = dispatcher.emit(self, "event.hello.world")
+        result = dispatcher.dispatch(self, "event.hello.world")
         self.assertIsNone(result, "Result should be none as there are no"
                           "registered handlers")
 
@@ -30,8 +30,8 @@ class EventSystemTestCase(unittest.TestCase):
         handler = dispatcher.observe(event_pattern=EVENT_NAME, priority=1000,
                                      callback=my_callback)
         self.assertIsInstance(handler, EventHandler)
-        result = dispatcher.emit(self, EVENT_NAME, 'first_pos_arg',
-                                 a_keyword_arg='another_thing')
+        result = dispatcher.dispatch(self, EVENT_NAME, 'first_pos_arg',
+                                     a_keyword_arg='another_thing')
         self.assertEqual(
             callback_tracker[0], "obs", "callback should have been invoked"
             "once and contain value `obs` but tracker value is {0}".format(
@@ -57,8 +57,8 @@ class EventSystemTestCase(unittest.TestCase):
         handler = dispatcher.intercept(event_pattern=EVENT_NAME, priority=1000,
                                        callback=my_callback)
         self.assertIsInstance(handler, EventHandler)
-        result = dispatcher.emit(self, EVENT_NAME, 'first_pos_arg',
-                                 a_keyword_arg='another_thing')
+        result = dispatcher.dispatch(self, EVENT_NAME, 'first_pos_arg',
+                                     a_keyword_arg='another_thing')
         self.assertEqual(
             callback_tracker[0], "intcpt", "callback should have been invoked"
             "once and contain value `intcpt` but tracker value is {0}".format(
@@ -92,8 +92,8 @@ class EventSystemTestCase(unittest.TestCase):
         dispatcher = SimpleEventDispatcher()
         dispatcher.observe(EVENT_NAME, 1000, my_callback_obs)
         dispatcher.intercept(EVENT_NAME, 1001, my_callback_intcpt)
-        result = dispatcher.emit(self, EVENT_NAME, 'first_pos_arg',
-                                 a_keyword_arg='another_thing')
+        result = dispatcher.dispatch(self, EVENT_NAME, 'first_pos_arg',
+                                     a_keyword_arg='another_thing')
         self.assertEqual(
             callback_tracker[0], "obs_intcpt_", "callback was not invoked in "
             "expected order. Should have been obs_intcpt_ but is {0}".format(
@@ -136,8 +136,8 @@ class EventSystemTestCase(unittest.TestCase):
         # register priorities out of order to test that too
         dispatcher.observe(EVENT_NAME, 1001, my_callback_obs)
         dispatcher.intercept(EVENT_NAME, 1000, my_callback_intcpt)
-        result = dispatcher.emit(self, EVENT_NAME, 'first_pos_arg',
-                                 a_keyword_arg='another_thing')
+        result = dispatcher.dispatch(self, EVENT_NAME, 'first_pos_arg',
+                                     a_keyword_arg='another_thing')
         self.assertEqual(
             callback_tracker[0], "intcpt_obs_", "callback was not invoked in "
             "expected order. Should have been intcpt_obs_ but is {0}".format(
@@ -170,7 +170,7 @@ class EventSystemTestCase(unittest.TestCase):
         dispatcher = SimpleEventDispatcher()
         dispatcher.intercept(EVENT_NAME, 2000, my_callback_intcpt1)
         dispatcher.intercept(EVENT_NAME, 2020, my_callback_intcpt2)
-        result = dispatcher.emit(self, EVENT_NAME)
+        result = dispatcher.dispatch(self, EVENT_NAME)
         self.assertEqual(
             callback_tracker[0], "intcpt1_intcpt2_", "callback was not invoked"
             " in expected order. Should have been intcpt1_intcpt2_ but is"
@@ -187,7 +187,7 @@ class EventSystemTestCase(unittest.TestCase):
         dispatcher.intercept("event.hello.world", 1000, my_callback)
         dispatcher.intercept("event.hello.world", 1000, my_callback)
         with self.assertRaises(HandlerException):
-            dispatcher.emit(self, "event.hello.world")
+            dispatcher.dispatch(self, "event.hello.world")
 
     def test_subscribe_event_duplicate_wildcard_priority(self):
 
@@ -198,7 +198,7 @@ class EventSystemTestCase(unittest.TestCase):
         dispatcher.intercept("event.hello.world", 1000, my_callback)
         dispatcher.intercept("event.hello.*", 1000, my_callback)
         with self.assertRaises(HandlerException):
-            dispatcher.emit(self, "event.hello.world")
+            dispatcher.dispatch(self, "event.hello.world")
 
     def test_subscribe_event_duplicate_wildcard_priority_allowed(self):
         # duplicate priorities for different wildcard namespaces allowed
@@ -209,7 +209,7 @@ class EventSystemTestCase(unittest.TestCase):
         dispatcher.intercept("event.hello.world", 1000, my_callback)
         dispatcher.intercept("someevent.hello.*", 1000, my_callback)
         # emit should work fine in this case with no exceptions
-        dispatcher.emit(self, "event.hello.world")
+        dispatcher.dispatch(self, "event.hello.world")
 
     def test_subscribe_multiple_events(self):
         EVENT_NAME = "event.hello.world"
@@ -241,7 +241,7 @@ class EventSystemTestCase(unittest.TestCase):
         # register to a different event with the same priority
         dispatcher.observe("event.hello.anotherworld", 2000, my_callback2)
         dispatcher.intercept("event.hello.anotherworld", 2020, my_callback3)
-        result = dispatcher.emit(self, EVENT_NAME)
+        result = dispatcher.dispatch(self, EVENT_NAME)
         self.assertEqual(
             callback_tracker[0], "event1_", "only `event.hello.world` handlers"
             " should have been  triggered but received {0}".format(
@@ -249,7 +249,7 @@ class EventSystemTestCase(unittest.TestCase):
         self.assertEqual(result, None, "Result should be `helloworld` "
                          "as this is the expected return value from the chain")
 
-        result = dispatcher.emit(self, "event.hello.anotherworld")
+        result = dispatcher.dispatch(self, "event.hello.anotherworld")
         self.assertEqual(
             callback_tracker[0], "event1_event2_event3_", "only handlers for"
             "  event `event.hello.anotherworld` should have been  triggered"
@@ -288,7 +288,7 @@ class EventSystemTestCase(unittest.TestCase):
         dispatcher.intercept("event.*.world", 2020, my_callback4)
         dispatcher.intercept("someevent.hello.there", 2030, my_callback3)
         # emit a series of events
-        result = dispatcher.emit(self, "event.hello.there")
+        result = dispatcher.dispatch(self, "event.hello.there")
 
         self.assertEqual(
             callback_tracker[0], "event1_event2_event3_event4_",
@@ -296,7 +296,7 @@ class EventSystemTestCase(unittest.TestCase):
                 callback_tracker[0]))
         self.assertEqual(result, "hellosomeotherworld")
 
-        result = dispatcher.emit(self, "event.test.hello.world")
+        result = dispatcher.dispatch(self, "event.test.hello.world")
         self.assertEqual(
             callback_tracker[0], "event1_event2_event3_event4_event1_event4_",
             "Event handlers executed in unexpected order {0}".format(
@@ -322,9 +322,9 @@ class EventSystemTestCase(unittest.TestCase):
 
         dispatcher = SimpleEventDispatcher()
         dispatcher.intercept("event.hello.world", 1000, my_callback1)
-        dispatcher.emit(self, "event.hello.world")
+        dispatcher.dispatch(self, "event.hello.world")
         dispatcher.intercept("event.hello.*", 1001, my_callback2)
-        result = dispatcher.emit(self, "event.hello.world")
+        result = dispatcher.dispatch(self, "event.hello.world")
 
         self.assertEqual(
             callback_tracker[0], "event1_event1_event2_",
@@ -351,7 +351,7 @@ class EventSystemTestCase(unittest.TestCase):
 
         dispatcher = SimpleEventDispatcher()
         hndlr1 = dispatcher.intercept(EVENT_NAME, 1000, my_callback1)
-        dispatcher.emit(self, EVENT_NAME)
+        dispatcher.dispatch(self, EVENT_NAME)
         hndlr2 = dispatcher.intercept("event.hello.*", 1001, my_callback2)
         # Both handlers should be registered
         self.assertListEqual(
@@ -366,7 +366,7 @@ class EventSystemTestCase(unittest.TestCase):
             [handler.callback for handler in
              dispatcher.get_handlers_for_event(EVENT_NAME)])
 
-        result = dispatcher.emit(self, EVENT_NAME)
+        result = dispatcher.dispatch(self, EVENT_NAME)
 
         self.assertEqual(
             callback_tracker[0], "event1_event2_",
@@ -375,5 +375,5 @@ class EventSystemTestCase(unittest.TestCase):
         self.assertEqual(result, "some")
 
         hndlr2.unsubscribe()
-        result = dispatcher.emit(self, "event.hello.world")
+        result = dispatcher.dispatch(self, "event.hello.world")
         self.assertEqual(result, None)

test/test_middleware_system.py

@@ -62,8 +62,8 @@ class MiddlewareSystemTestCase(unittest.TestCase):
         manager = SimpleMiddlewareManager(dispatcher)
         middleware = DummyMiddleWare()
         manager.add(middleware)
-        dispatcher.emit(self, EVENT_NAME, 'first_pos_arg',
-                        a_keyword_arg='something')
+        dispatcher.dispatch(self, EVENT_NAME, 'first_pos_arg',
+                            a_keyword_arg='something')
 
         self.assertEqual(middleware.invocation_order, "intercept_observe")
         self.assertListEqual(
@@ -106,7 +106,7 @@ class MiddlewareSystemTestCase(unittest.TestCase):
         middleware2 = DummyMiddleWare2()
         manager.add(middleware1)
         manager.add(middleware2)
-        dispatcher.emit(self, EVENT_NAME)
+        dispatcher.dispatch(self, EVENT_NAME)
 
         # Callbacks in both middleware classes should be registered
         self.assertListEqual(
@@ -157,7 +157,7 @@ class MiddlewareSystemTestCase(unittest.TestCase):
         manager = SimpleMiddlewareManager(dispatcher)
         some_obj = SomeDummyClass()
         middleware = manager.add(some_obj)
-        dispatcher.emit(self, EVENT_NAME)
+        dispatcher.dispatch(self, EVENT_NAME)
 
         # Middleware should be discovered even if class containing interceptors
         # doesn't inherit from Middleware