summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/loading.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-05-19 17:43:54 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2014-05-19 17:43:54 -0400
commit665eced208b9e277f4b5cdb64f5ef0613938e11a (patch)
tree6a288a531fe928e0f910ab2a56f37fbef7bc7b90 /lib/sqlalchemy/orm/loading.py
parentfd57a4116301c91a651e397f65235bc6a766a39d (diff)
downloadsqlalchemy-665eced208b9e277f4b5cdb64f5ef0613938e11a.tar.gz
inlining
Diffstat (limited to 'lib/sqlalchemy/orm/loading.py')
-rw-r--r--lib/sqlalchemy/orm/loading.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/sqlalchemy/orm/loading.py b/lib/sqlalchemy/orm/loading.py
index 8fcace9be..7ea54d4cd 100644
--- a/lib/sqlalchemy/orm/loading.py
+++ b/lib/sqlalchemy/orm/loading.py
@@ -318,10 +318,8 @@ def instance_processor(mapper, context, path, adapter,
append_result = listeners.append_result or None
populate_existing = context.populate_existing or mapper.always_refresh
invoke_all_eagers = context.invoke_all_eagers
-
load_evt = mapper.class_manager.dispatch.load or None
refresh_evt = mapper.class_manager.dispatch.refresh or None
-
instance_state = attributes.instance_state
instance_dict = attributes.instance_dict
@@ -335,8 +333,7 @@ def instance_processor(mapper, context, path, adapter,
_populators(mapper, context, path, row, adapter,
new_populators,
existing_populators,
- eager_populators
- )
+ eager_populators)
if translate_row:
for fn in translate_row:
@@ -490,7 +487,7 @@ def instance_processor(mapper, context, path, adapter,
if key not in state.unloaded:
pop(state, dict_, row)
- if isnew:
+ if isnew and refresh_evt:
state.manager.dispatch.refresh(state, context, attrs)
if result is not None: