find some more inline imports and move them out

diff --git a/lib/sqlalchemy/engine/url.py b/lib/sqlalchemy/engine/url.py
index ed5729eea9a20ea51e9018cf98cd8aded49f043f..717eb54e16be9e2c828aefd0acca725e6b5cf2cb 100644 (file)
--- a/lib/sqlalchemy/engine/url.py
+++ b/lib/sqlalchemy/engine/url.py
@@ -16,6 +16,7 @@ be used directly and is also accepted directly by ``create_engine()``.
 import re
 from .. import exc, util
 from . import Dialect
+from ..dialects import registry
 
 
 class URL(object):
@@ -102,7 +103,6 @@ class URL(object):
             name = self.drivername
         else:
             name = self.drivername.replace('+', '.')
-        from sqlalchemy.dialects import registry
         cls = registry.load(name)
         # check for legacy dialects that
         # would return a module with 'dialect' as the

diff --git a/lib/sqlalchemy/orm/loading.py b/lib/sqlalchemy/orm/loading.py
index 1641f509e162b0955d3d5bf8d0f0b5b3c3ba7585..c219ea096a210e96a60449ccf818acab88f9a5ac 100644 (file)
--- a/lib/sqlalchemy/orm/loading.py
+++ b/lib/sqlalchemy/orm/loading.py
@@ -19,6 +19,8 @@ from .interfaces import EXT_CONTINUE
 from ..sql import util as sql_util
 from .util import _none_set, state_str
 from .. import exc as sa_exc
+
+querylib = util.importlater("sqlalchemy.orm", "query")
 sessionlib = util.importlater("sqlalchemy.orm", "session")
 
 _new_runid = util.counter()
@@ -101,8 +103,6 @@ def instances(query, cursor, context):
 def merge_result(query, iterator, load=True):
     """Merge a result into this :class:`.Query` object's Session."""
 
-    from . import query as querylib
-
     session = query.session
     if load:
         # flush current contents if we expect to load data

diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py
index 5986556db652b3b1ef105de48729e9291b76b1e3..1bc2cff05d3571333f3bc6f8177bdd234f402a16 100644 (file)
--- a/lib/sqlalchemy/orm/properties.py
+++ b/lib/sqlalchemy/orm/properties.py
@@ -24,6 +24,7 @@ from .util import CascadeOptions, \
 from .interfaces import MANYTOMANY, MANYTOONE, ONETOMANY,\
         PropComparator, StrategizedProperty
 
+dynamic = util.importlater("sqlalchemy.orm", "dynamic")
 mapperlib = util.importlater("sqlalchemy.orm", "mapperlib")
 NoneType = type(None)
 
@@ -300,7 +301,6 @@ class RelationshipProperty(StrategizedProperty):
         if strategy_class:
             self.strategy_class = strategy_class
         elif self.lazy == 'dynamic':
-            from sqlalchemy.orm import dynamic
             self.strategy_class = dynamic.DynaLoader
         else:
             self.strategy_class = strategies.factory(self.lazy)

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index f6fd07e61cdbfdebe279ff6093938b9d922f561f..5ed63916ace63ace3b21b9a114fcca9058cad52b 100644 (file)
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -36,6 +36,7 @@ from ..sql import (
         util as sql_util,
         expression, visitors
     )
+properties = util.importlater("sqlalchemy.orm", "properties")
 
 __all__ = ['Query', 'QueryContext', 'aliased']
 
@@ -903,7 +904,6 @@ class Query(object):
         """
 
         if property is None:
-            from sqlalchemy.orm import properties
             mapper = object_mapper(instance)
 
             for prop in mapper.iterate_properties:

diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index aa46d06a837fa8df7a3998c83e3cf51b54e62b2a..fac8a3c6f95eabe43b512b3afac7d44853bada3e 100644 (file)
--- a/lib/sqlalchemy/orm/strategies.py
+++ b/lib/sqlalchemy/orm/strategies.py
@@ -350,7 +350,6 @@ class LazyLoader(AbstractRelationshipLoader):
 
         # determine if our "lazywhere" clause is the same as the mapper's
         # get() clause.  then we can just use mapper.get()
-        #from sqlalchemy.orm import query
         self.use_get = not self.uselist and \
                         self.mapper._get_clause[0].compare(
                             self._lazywhere,

diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py
index ebcc9a7ed373cbe00d20adb25547332f2e57f2f3..83d99f9c325282f87791b1aaba9c0c31de822147 100644 (file)
--- a/lib/sqlalchemy/schema.py
+++ b/lib/sqlalchemy/schema.py
@@ -33,6 +33,7 @@ import inspect
 from . import exc, util, dialects, event, events, inspection
 from .sql import expression, visitors
 import collections
+import sqlalchemy
 
 ddl = util.importlater("sqlalchemy.engine", "ddl")
 sqlutil = util.importlater("sqlalchemy.sql", "util")
@@ -2741,8 +2742,7 @@ class MetaData(SchemaItem):
         """Bind this MetaData to an Engine, Connection, string or URL."""
 
         if isinstance(bind, util.string_types + (url.URL, )):
-            from sqlalchemy import create_engine
-            self._bind = create_engine(bind)
+            self._bind = sqlalchemy.create_engine(bind)
         else:
             self._bind = bind
     bind = property(bind, _bind_to)
@@ -2971,8 +2971,7 @@ class ThreadLocalMetaData(MetaData):
             try:
                 self.context._engine = self.__engines[bind]
             except KeyError:
-                from sqlalchemy import create_engine
-                e = create_engine(bind)
+                e = sqlalchemy.create_engine(bind)
                 self.__engines[bind] = e
                 self.context._engine = e
         else: