summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/state.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-09-23 13:09:43 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2012-09-23 13:09:43 -0400
commitbce3ffc3412737eae51cfe2ba231c6d1366a7d16 (patch)
treef82e11b578a212af9e1f809c4b2d1856a3b54fcd /lib/sqlalchemy/orm/state.py
parent152163b3336970460b605fc2a79766d94f467f8d (diff)
downloadsqlalchemy-bce3ffc3412737eae51cfe2ba231c6d1366a7d16.tar.gz
- use our new Cls.memoized_name._reset(self) method in place of all those __dict__.pop(),
remove reset_memoized
Diffstat (limited to 'lib/sqlalchemy/orm/state.py')
-rw-r--r--lib/sqlalchemy/orm/state.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/orm/state.py b/lib/sqlalchemy/orm/state.py
index 0f60c6712..9ef27f0d4 100644
--- a/lib/sqlalchemy/orm/state.py
+++ b/lib/sqlalchemy/orm/state.py
@@ -325,12 +325,12 @@ class InstanceState(interfaces._InspectionAttr):
self.committed_state.clear()
- self.__dict__.pop('_pending_mutations', None)
+ InstanceState._pending_mutations._reset(self)
# clear out 'parents' collection. not
# entirely clear how we can best determine
# which to remove, or not.
- self.__dict__.pop('parents', None)
+ InstanceState.parents._reset(self)
for key in self.manager:
impl = self.manager[key].impl
@@ -502,7 +502,7 @@ class InstanceState(interfaces._InspectionAttr):
for state, dict_ in iter:
state.committed_state.clear()
- state.__dict__.pop('_pending_mutations', None)
+ InstanceState._pending_mutations._reset(state)
callables = state.callables
for key in list(callables):