diff options
| author | Philip Jenvey <pjenvey@underboss.org> | 2009-08-21 02:19:07 +0000 |
|---|---|---|
| committer | Philip Jenvey <pjenvey@underboss.org> | 2009-08-21 02:19:07 +0000 |
| commit | 7d07ee0b39ce1068a8c3c06f6672ef9c94fb184e (patch) | |
| tree | e1abf1d95a213c5fc3f1a72e423142d4431b66f0 /lib/sqlalchemy/orm/state.py | |
| parent | c43073b65951051c23fe7b05a76e7cec3f2762de (diff) | |
| download | sqlalchemy-7d07ee0b39ce1068a8c3c06f6672ef9c94fb184e.tar.gz | |
instance_dict may be modified before the GC triggers _cleanup on Jython, so eat
state mismatch AssertionErrors
Diffstat (limited to 'lib/sqlalchemy/orm/state.py')
| -rw-r--r-- | lib/sqlalchemy/orm/state.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/state.py b/lib/sqlalchemy/orm/state.py index f09c59763..25e557eda 100644 --- a/lib/sqlalchemy/orm/state.py +++ b/lib/sqlalchemy/orm/state.py @@ -47,7 +47,10 @@ class InstanceState(object): def _cleanup(self, ref): instance_dict = self._instance_dict() if instance_dict: - instance_dict.remove(self) + try: + instance_dict.remove(self) + except AssertionError: + pass self.dispose() def obj(self): @@ -418,7 +421,10 @@ class MutableAttrInstanceState(InstanceState): else: instance_dict = self._instance_dict() if instance_dict: - instance_dict.remove(self) + try: + instance_dict.remove(self) + except AssertionError: + pass self.dispose() def __resurrect(self): |