instance_dict may be modified before the GC triggers _cleanup on Jython, so eat

state mismatch AssertionErrors

diff --git a/lib/sqlalchemy/orm/state.py b/lib/sqlalchemy/orm/state.py
index f09c5976399ec05c029c0d9bce074b9f16a0096c..25e557edae0215431892ca5d528b6558d9bbef24 100644 (file)
--- 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):