From eabf41b392ac042228765c9b95138522e44365e7 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Fri, 11 Oct 2013 16:49:36 -0400 Subject: use accepts scalar loader here so we deal with _ProxyImpl correctly --- lib/sqlalchemy/orm/state.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'lib/sqlalchemy') diff --git a/lib/sqlalchemy/orm/state.py b/lib/sqlalchemy/orm/state.py index 2c947a7ac..8d73c9426 100644 --- a/lib/sqlalchemy/orm/state.py +++ b/lib/sqlalchemy/orm/state.py @@ -394,12 +394,10 @@ class InstanceState(interfaces._InspectionAttr): @property def _unloaded_non_object(self): - return self.unloaded.difference(self._uses_objects) - - @property - def _uses_objects(self): - return (attr for attr in self.manager - if self.manager[attr].impl.uses_objects) + return self.unloaded.intersection( + attr for attr in self.manager + if self.manager[attr].impl.accepts_scalar_loader + ) @property def expired_attributes(self): -- cgit v1.2.1