Merge branch 'master' into oracle-servicename-optionpr/152

1 files changed, 10 insertions, 6 deletions

diff --git a/lib/sqlalchemy/event/registry.py b/lib/sqlalchemy/event/registry.py
index 5b422c401..ebc0e6d18 100644
--- a/lib/sqlalchemy/event/registry.py
+++ b/lib/sqlalchemy/event/registry.py
@@ -37,7 +37,7 @@ listener collections and the listener fn contained
 
 _collection_to_key = collections.defaultdict(dict)
 """
-Given a _ListenerCollection or _DispatchDescriptor, can locate
+Given a _ListenerCollection or _ClsLevelListener, can locate
 all the original listen() arguments and the listener fn contained
 
 ref(listenercollection) -> {
@@ -140,6 +140,10 @@ class _EventKey(object):
     """Represent :func:`.listen` arguments.
     """
 
+    __slots__ = (
+        'target', 'identifier', 'fn', 'fn_key', 'fn_wrap', 'dispatch_target'
+    )
+
     def __init__(self, target, identifier,
                  fn, dispatch_target, _fn_wrap=None):
         self.target = target
@@ -187,9 +191,9 @@ class _EventKey(object):
         target, identifier, fn = \
             self.dispatch_target, self.identifier, self._listen_fn
 
-        dispatch_descriptor = getattr(target.dispatch, identifier)
+        dispatch_collection = getattr(target.dispatch, identifier)
 
-        adjusted_fn = dispatch_descriptor._adjust_fn_spec(fn, named)
+        adjusted_fn = dispatch_collection._adjust_fn_spec(fn, named)
 
         self = self.with_wrapper(adjusted_fn)
 
@@ -226,13 +230,13 @@ class _EventKey(object):
         target, identifier, fn = \
             self.dispatch_target, self.identifier, self._listen_fn
 
-        dispatch_descriptor = getattr(target.dispatch, identifier)
+        dispatch_collection = getattr(target.dispatch, identifier)
 
         if insert:
-            dispatch_descriptor.\
+            dispatch_collection.\
                 for_modify(target.dispatch).insert(self, propagate)
         else:
-            dispatch_descriptor.\
+            dispatch_collection.\
                 for_modify(target.dispatch).append(self, propagate)
 
     @property