moved the non-expire of unloaded deferred attributes into the attributes package

1 files changed, 1 insertions, 8 deletions

diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index ea8174726..4fb6c1859 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -1518,14 +1518,7 @@ class Session(object):
 
         return util.IdentitySet(self._new.values())
 
-def _expire_state(state, attribute_names):
-    if attribute_names is None:
-        state.expired = True
-        state.modified= False
-        # dont add unloaded deferred attributes to the list of attrs
-        attribute_names = set(state.manager.keys()).\
-                difference([k for k in state.manager.mapper._deferred_props if k not in state.dict])
-    state.expire_attributes(attribute_names)
+_expire_state = attributes.InstanceState.expire_attributes
     
 UOWEventHandler = unitofwork.UOWEventHandler