Changeset 279 for elixir/trunk/elixir/entity.py

Timestamp:

12/10/07 16:24:08 (5 years ago)

Author:

ged

Message:

• make inheritance work for custom base classes (closes #25).
  
• remove debug "print" in associable
  

Files:

• elixir/trunk/elixir/entity.py (modified) (3 diffs)

elixir/trunk/elixir/entity.py

@@ -86 +86 @@
 
         for base in entity.__bases__:
-            if issubclass(base, Entity) and base is not Entity:
+            if isinstance(base, EntityMeta) and not base.__bases__[0] is object:
                 if self.parent:
                     raise Exception('%s entity inherits from several entities,'
@@ -582 +582 @@
 
 
-def _is_entity(class_):
-    return isinstance(class_, EntityMeta)
-
-
 class EntityMeta(type):
     """
@@ -610 +606 @@
         # another module.
         for entity in [e for e in caller_frame.f_locals.values() 
-                         if _is_entity(e)]:
+                         if isinstance(e, EntityMeta)]:
             caller_entities[entity.__name__] = entity