- 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, 11 insertions, 9 deletions

diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index d21d0fbb9..98156cdc9 100644
--- a/lib/sqlalchemy/__init__.py
+++ b/lib/sqlalchemy/__init__.py
@@ -4,8 +4,6 @@
 # This module is part of SQLAlchemy and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
-import inspect as _inspect
-import sys
 
 from .sql import (
     alias,
@@ -114,16 +112,20 @@ from .schema import (
 
 
 from .inspection import inspect
-
 from .engine import create_engine, engine_from_config
 
+__version__ = '0.9.0'
 
-__all__ = sorted(name for name, obj in locals().items()
-                 if not (name.startswith('_') or _inspect.ismodule(obj)))
+def __go(lcls):
+    global __all__
 
-__version__ = '0.9.0'
+    from . import events
+    from . import util as _sa_util
+
+    import inspect as _inspect
 
-del _inspect, sys
+    __all__ = sorted(name for name, obj in lcls.items()
+                 if not (name.startswith('_') or _inspect.ismodule(obj)))
 
-from . import util as _sa_util
-_sa_util.importlater.resolve_all("sqlalchemy")
\ No newline at end of file
+    _sa_util.dependencies.resolve_all("sqlalchemy")
+__go(locals())
\ No newline at end of file