From: Mike Bayer Date: Tue, 28 May 2013 05:43:12 +0000 (-0400) Subject: - move an import stuck in the middle here... X-Git-Tag: rel_0_8_2~67^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e86b7df96cae94ad277bc1a40df51c77c7b30f4a;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git - move an import stuck in the middle here... --- diff --git a/lib/sqlalchemy/orm/persistence.py b/lib/sqlalchemy/orm/persistence.py index e225a7c83c..5bc4739c15 100644 --- a/lib/sqlalchemy/orm/persistence.py +++ b/lib/sqlalchemy/orm/persistence.py @@ -19,6 +19,7 @@ from .. import sql, util, exc as sa_exc, schema from . import attributes, sync, exc as orm_exc, evaluator from .util import _state_mapper, state_str, _attr_as_key from ..sql import expression +from . import loading def save_obj(base_mapper, states, uowtransaction, single=False): @@ -699,7 +700,6 @@ def _finalize_insert_update_commands(base_mapper, uowtransaction, # refresh whatever has been expired. if base_mapper.eager_defaults and state.unloaded: state.key = base_mapper._identity_key_from_state(state) - from . import loading loading.load_on_ident( uowtransaction.session.query(base_mapper), state.key, refresh_state=state,