Changeset 504 for elixir/trunk/elixir

Timestamp:

10/15/09 11:48:08 (3 years ago)

Author:

ged

Message:

- Fixed custom bases classes and versioned extension when used with zope

interfaces (closes #98, patch from Valentin Lab)

Location:

elixir/trunk/elixir

Files:

• entity.py (modified) (4 diffs)
• ext/versioned.py (modified) (2 diffs)

elixir/trunk/elixir/entity.py

@@ -5 +5 @@
 
 import sys
-import inspect
 import types
 import warnings
@@ -319 +318 @@
         # create a list of callbacks for each event
         methods = {}
-        entity = self.entity
-
-        # Note that we don't use inspect.getmembers because of
-        # http://bugs.python.org/issue1785
-        # See also http://elixir.ematia.de/trac/changeset/262
-
-        # dir returns the attributes of the class and *all its parents* listed
-        # alphabetically.
-        for key in dir(entity):
-            try:
-                value = getattr(entity, key)
-                if isinstance(value, types.MethodType):
-                    for event in getattr(value, '_elixir_events', []):
-                        event_methods = methods.setdefault(event, [])
-                        event_methods.append(value)
-            except AttributeError:
-                pass
+
+        all_methods = getmembers(self.entity,
+                                 lambda a: isinstance(a, types.MethodType))
+
+        for name, method in all_methods:
+            for event in getattr(method, '_elixir_events', []):
+                event_methods = methods.setdefault(event, [])
+                event_methods.append(method)
+
         if not methods:
             return
@@ -691 +682 @@
 
 
+# Note that we don't use inspect.getmembers because of
+# http://bugs.python.org/issue1785
+# See also http://elixir.ematia.de/trac/changeset/262
+def getmembers(object, predicate=None):
+    base_props = []
+    for key in dir(object):
+        try:
+            value = getattr(object, key)
+        except AttributeError:
+            continue
+        if not predicate or predicate(value):
+            base_props.append((key, value))
+    return base_props
+
+
 def instrument_class(cls):
     """
@@ -710 +716 @@
         # We use inspect.getmembers (instead of __dict__) so that we also
         # get the properties from the parents of the base_class if any.
-        base_props = inspect.getmembers(entity_base,
-                                        lambda a: isinstance(a, Property))
+        base_props = getmembers(entity_base,
+                                lambda a: isinstance(a, Property))
         base_props = [(name, copy(attr)) for name, attr in base_props]
     else:

elixir/trunk/elixir/ext/versioned.py

@@ -56 +56 @@
 from elixir.statements     import Statement
 from elixir.properties     import EntityBuilder
+from elixir.entity         import getmembers
 
 __all__ = ['acts_as_versioned', 'after_revert']
@@ -177 +178 @@
         # look for events
         after_revert_events = []
-        for name, func in inspect.getmembers(entity, inspect.ismethod):
+        for name, func in getmembers(entity, inspect.ismethod):
             if getattr(func, '_elixir_after_revert', False):
                 after_revert_events.append(func)