From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 27 Apr 2017 18:33:54 +0000 (-0400)
Subject: - ensure that sqlalchemy.ext is set up for importlater
X-Git-Tag: rel_1_2_0b1~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63ff0140705207198545e3a0d7868a5ba8486e93;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- ensure that sqlalchemy.ext is set up for importlater

otherwise, it fails if you import from ext before orm:

    from sqlalchemy import *
    from sqlalchemy.ext.declarative import declarative_base
    from sqlalchemy.orm import *

and then do a lazyload, as the ext.baked importlater is not
initialized.

Change-Id: I24dcbfc9ca9022316da28507772562833e45dd95
---

diff --git a/lib/sqlalchemy/orm/__init__.py b/lib/sqlalchemy/orm/__init__.py
index 8d46324e8e..adfe2360a8 100644
--- a/lib/sqlalchemy/orm/__init__.py
+++ b/lib/sqlalchemy/orm/__init__.py
@@ -274,5 +274,6 @@ def __go(lcls):
                      if not (name.startswith('_') or _inspect.ismodule(obj)))
 
     _sa_util.dependencies.resolve_all("sqlalchemy.orm")
+    _sa_util.dependencies.resolve_all("sqlalchemy.ext")
 
 __go(locals())
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index ddf5397fd3..00aabed0bb 100644
--- a/lib/sqlalchemy/orm/strategies.py
+++ b/lib/sqlalchemy/orm/strategies.py
@@ -596,7 +596,6 @@ class LazyLoader(AbstractRelationshipLoader, util.MemoizedSlots):
         "sqlalchemy.orm.strategy_options")
     def _emit_lazyload(
             self, strategy_options, session, state, ident_key, passive):
-
         # emit lazy load now using BakedQuery, to cut way down on the overhead
         # of generating queries.
         # there are two big things we are trying to guard against here: