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

Timestamp:

08/31/07 15:59:15 (6 years ago)

Author:

ged

Message:

more frame hackery so that one can use a class from another module in a relation target without prefixing
it by the module name if the target class as been imported in the local module.

Files:

• elixir/trunk/elixir/entity.py (modified) (1 diff)

elixir/trunk/elixir/entity.py

@@ -487 +487 @@
             return
 
-        cid = cls._caller = id(sys._getframe(1))
+        # build a dict of entities for each frame where there are entities
+        # defined
+        caller_frame = sys._getframe(1)
+        cid = cls._caller = id(caller_frame)
         caller_entities = EntityMeta._entities.setdefault(cid, {})
         caller_entities[name] = cls
+
+        # Append all entities which are currently visible by the entity. This 
+        # will find more entities only if some of them where imported from another
+        # module.
+        for entity in [e for e in caller_frame.f_locals.values() 
+                         if e.__class__.__name__ == 'EntityMeta']:
+            caller_entities[entity.__name__] = entity
 
         # create the entity descriptor