From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 17 Apr 2010 10:55:33 +0000 (-0400)
Subject: inline this
X-Git-Tag: rel_0_6_0~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=30df193cd17ed09570ef897dd139a2201360413c;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

inline this
---

diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py
index dee0ec9c7f..5ac8ef9ee4 100644
--- a/lib/sqlalchemy/orm/attributes.py
+++ b/lib/sqlalchemy/orm/attributes.py
@@ -500,10 +500,9 @@ class MutableScalarAttributeImpl(ScalarAttributeImpl):
             self, state, v)
 
     def check_mutable_modified(self, state, dict_):
-        added, \
-        unchanged, \
-        deleted = self.get_history(state, dict_, passive=PASSIVE_NO_INITIALIZE)
-        return bool(added or deleted)
+        v = dict_.get(self.key, NO_VALUE)
+        a, u, d = History.from_attribute(self, state, v)
+        return bool(a or d)
 
     def get(self, state, dict_, passive=PASSIVE_OFF):
         if self.key not in state.mutable_dict:
@@ -1291,7 +1290,7 @@ class History(tuple):
              and instance_state(c) or None
              for c in self.deleted],
             )
-    
+        
     @classmethod
     def from_attribute(cls, attribute, state, current):
         original = state.committed_state.get(attribute.key, NEVER_SET)