diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-10-11 16:49:36 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-10-11 16:49:36 -0400 |
| commit | eabf41b392ac042228765c9b95138522e44365e7 (patch) | |
| tree | 33b1c2c907d07c74b51b842341069fc0f2290b74 /lib/sqlalchemy/orm/state.py | |
| parent | 75be18004fac80de6aabea409c059eaaa0dd5244 (diff) | |
| download | sqlalchemy-eabf41b392ac042228765c9b95138522e44365e7.tar.gz | |
use accepts scalar loader here so we deal with _ProxyImpl correctly
Diffstat (limited to 'lib/sqlalchemy/orm/state.py')
| -rw-r--r-- | lib/sqlalchemy/orm/state.py | 10 |
1 files changed, 4 insertions, 6 deletions
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): |