- 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

3 files changed, 7 insertions, 6 deletions

diff --git a/lib/sqlalchemy/ext/declarative/api.py b/lib/sqlalchemy/ext/declarative/api.py
index 90076fdbb..b309a783a 100644
--- a/lib/sqlalchemy/ext/declarative/api.py
+++ b/lib/sqlalchemy/ext/declarative/api.py
@@ -10,7 +10,8 @@ from ...schema import Table, MetaData
 from ...orm import synonym as _orm_synonym, mapper,\
                                 comparable_property,\
                                 interfaces
-from ...orm.util import polymorphic_union, _mapper_or_none
+from ...orm.util import polymorphic_union
+from ...orm.base import _mapper_or_none
 from ... import exc
 import weakref
 
diff --git a/lib/sqlalchemy/ext/declarative/base.py b/lib/sqlalchemy/ext/declarative/base.py
index 5a2b88db4..820c0874b 100644
--- a/lib/sqlalchemy/ext/declarative/base.py
+++ b/lib/sqlalchemy/ext/declarative/base.py
@@ -9,7 +9,7 @@ from ...schema import Table, Column
 from ...orm import mapper, class_mapper
 from ...orm.interfaces import MapperProperty
 from ...orm.properties import ColumnProperty, CompositeProperty
-from ...orm.util import _is_mapped_class
+from ...orm.base import _is_mapped_class
 from ... import util, exc
 from ...sql import expression
 from ... import event
diff --git a/lib/sqlalchemy/ext/instrumentation.py b/lib/sqlalchemy/ext/instrumentation.py
index bb44a492c..714a76e68 100644
--- a/lib/sqlalchemy/ext/instrumentation.py
+++ b/lib/sqlalchemy/ext/instrumentation.py
@@ -31,7 +31,7 @@ from ..orm.instrumentation import (
     ClassManager, InstrumentationFactory, _default_state_getter,
     _default_dict_getter, _default_manager_getter
 )
-from ..orm import attributes, collections
+from ..orm import attributes, collections, base as orm_base
 from .. import util
 from ..orm import exc as orm_exc
 import weakref
@@ -399,9 +399,9 @@ def _install_lookups(lookups):
     instance_state = lookups['instance_state']
     instance_dict = lookups['instance_dict']
     manager_of_class = lookups['manager_of_class']
-    attributes.instance_state = \
+    orm_base.instance_state = attributes.instance_state = \
         orm_instrumentation.instance_state = instance_state
-    attributes.instance_dict = \
+    orm_base.instance_dict = attributes.instance_dict = \
         orm_instrumentation.instance_dict = instance_dict
-    attributes.manager_of_class = \
+    orm_base.manager_of_class = attributes.manager_of_class = \
         orm_instrumentation.manager_of_class = manager_of_class