further refinements to the previous session.expunge() fix

2 files changed, 6 insertions, 12 deletions

diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index ddf7d6251..15e422eec 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -380,10 +380,11 @@ class Session(object):
         Cascading will be applied according to the *expunge* cascade
         rule.
         """
-
+        self._validate_persistent(object)
         for c in [object] + list(_object_mapper(object).cascade_iterator('expunge', object)):
-            self.uow._remove_deleted(c)
-            self._unattach(c)
+            if c in self:
+                self.uow._remove_deleted(c)
+                self._unattach(c)
 
     def save(self, object, entity_name=None):
         """Add a transient (unsaved) instance to this ``Session``.
@@ -615,16 +616,9 @@ class Session(object):
             obj._sa_session_id = self.hash_key
 
     def _unattach(self, obj):
-        self._validate_attached(obj)
-        del obj._sa_session_id
-
-    def _validate_attached(self, obj):
-        """Validate that the given object is either pending or
-        persistent within this Session.
-        """
-
         if not self._is_attached(obj):
             raise exceptions.InvalidRequestError("Instance '%s' not attached to this Session" % repr(obj))
+        del obj._sa_session_id
 
     def _validate_persistent(self, obj):
         """Validate that the given object is persistent within this
diff --git a/lib/sqlalchemy/orm/unitofwork.py b/lib/sqlalchemy/orm/unitofwork.py
index 5f28d28e7..c6b0b2689 100644
--- a/lib/sqlalchemy/orm/unitofwork.py
+++ b/lib/sqlalchemy/orm/unitofwork.py
@@ -108,7 +108,7 @@ class UnitOfWork(object):
     echo = logging.echo_property()
 
     def _remove_deleted(self, obj):
-        if hasattr(obj, "_instance_key") and obj._instance_key in self.identity_map:
+        if hasattr(obj, "_instance_key"):
             del self.identity_map[obj._instance_key]
         try:
             self.deleted.remove(obj)