- apply an import refactoring to the ORM as well

- rework the event system so that event modules load after their
targets, dependencies are reversed
- create an improved strategy lookup system for the ORM
- rework the ORM to have very few import cycles
- move out "importlater" to just util.dependency
- other tricks to cross-populate modules in as clear a way as possible

1 files changed, 3 insertions, 1 deletions

diff --git a/lib/sqlalchemy/orm/deprecated_interfaces.py b/lib/sqlalchemy/orm/deprecated_interfaces.py
index e50967253..34a976c91 100644
--- a/lib/sqlalchemy/orm/deprecated_interfaces.py
+++ b/lib/sqlalchemy/orm/deprecated_interfaces.py
@@ -7,7 +7,7 @@
 from .. import event, util
 from .interfaces import EXT_CONTINUE
 
-
+@util.langhelpers.dependency_for("sqlalchemy.orm.interfaces")
 class MapperExtension(object):
     """Base implementation for :class:`.Mapper` event hooks.
 
@@ -374,6 +374,7 @@ class MapperExtension(object):
         return EXT_CONTINUE
 
 
+@util.langhelpers.dependency_for("sqlalchemy.orm.interfaces")
 class SessionExtension(object):
 
     """Base implementation for :class:`.Session` event hooks.
@@ -494,6 +495,7 @@ class SessionExtension(object):
         """
 
 
+@util.langhelpers.dependency_for("sqlalchemy.orm.interfaces")
 class AttributeExtension(object):
     """Base implementation for :class:`.AttributeImpl` event hooks, events
     that fire upon attribute mutations in user code.