Merge branch 'master' into ticket_2501ticket_2501

Conflicts:
	lib/sqlalchemy/orm/mapper.py

1 files changed, 17 insertions, 12 deletions

diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index 2c805e607..1d1f8c4aa 100644
--- a/lib/sqlalchemy/__init__.py
+++ b/lib/sqlalchemy/__init__.py
@@ -1,11 +1,9 @@
 # sqlalchemy/__init__.py
-# Copyright (C) 2005-2013 the SQLAlchemy authors and contributors <see AUTHORS file>
+# Copyright (C) 2005-2014 the SQLAlchemy authors and contributors <see AUTHORS file>
 #
 # 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,
@@ -23,6 +21,7 @@ from .sql import (
     except_all,
     exists,
     extract,
+    false,
     func,
     insert,
     intersect,
@@ -40,6 +39,7 @@ from .sql import (
     select,
     subquery,
     text,
+    true,
     tuple_,
     type_coerce,
     union,
@@ -97,7 +97,6 @@ from .schema import (
     Column,
     ColumnDefault,
     Constraint,
-    DDL,
     DefaultClause,
     FetchedValue,
     ForeignKey,
@@ -110,19 +109,25 @@ from .schema import (
     Table,
     ThreadLocalMetaData,
     UniqueConstraint,
-    )
+    DDL,
+)
 
-from .inspection import inspect
 
+from .inspection import inspect
 from .engine import create_engine, engine_from_config
 
+__version__ = '0.9.2'
 
-__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
 
-del _inspect, sys
+    import inspect as _inspect
+
+    __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()
+    _sa_util.dependencies.resolve_all("sqlalchemy")
+__go(locals())
\ No newline at end of file