diff options
Diffstat (limited to 'lib/sqlalchemy/orm')
| -rw-r--r-- | lib/sqlalchemy/orm/instrumentation.py | 7 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/session.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/state.py | 2 |
3 files changed, 2 insertions, 9 deletions
diff --git a/lib/sqlalchemy/orm/instrumentation.py b/lib/sqlalchemy/orm/instrumentation.py index cce13f356..78a573cfd 100644 --- a/lib/sqlalchemy/orm/instrumentation.py +++ b/lib/sqlalchemy/orm/instrumentation.py @@ -110,13 +110,6 @@ class ClassManager(dict): attr.impl for attr in self.values() if attr.impl.accepts_scalar_loader]) - @_memoized_key_collection - def _non_scalar_loader_keys(self): - return frozenset([ - attr.key for attr in self.values() - if not attr.impl.accepts_scalar_loader - ]) - @util.memoized_property def mapper(self): # raises unless self.mapper has been assigned diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py index 55b19749e..c47026969 100644 --- a/lib/sqlalchemy/orm/session.py +++ b/lib/sqlalchemy/orm/session.py @@ -2691,7 +2691,7 @@ def make_transient(instance): if s: s._expunge_state(state) - # remove expired state and + # remove expired state state.expired_attributes.clear() # remove deferred callables diff --git a/lib/sqlalchemy/orm/state.py b/lib/sqlalchemy/orm/state.py index 8aa6fbe5f..7691c9826 100644 --- a/lib/sqlalchemy/orm/state.py +++ b/lib/sqlalchemy/orm/state.py @@ -266,7 +266,7 @@ class InstanceState(interfaces.InspectionAttr): # we can't possibly be in instance_dict._modified # b.c. this is weakref cleanup only, that set # is strong referencing! - assert self not in instance_dict._modified + # assert self not in instance_dict._modified self.session_id = self._strong_obj = None del self.obj |