From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 17 Sep 2005 05:18:36 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: rel_0_1_0~703
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76f047194f3b93f40742703ce974601da021e087;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

---

diff --git a/lib/sqlalchemy/objectstore.py b/lib/sqlalchemy/objectstore.py
index d85a9591ad..b4d2ccff92 100644
--- a/lib/sqlalchemy/objectstore.py
+++ b/lib/sqlalchemy/objectstore.py
@@ -172,9 +172,9 @@ class UnitOfWork(object):
             obj.__dict__[key] = childlist
         
         if callable(childlist):
-            childlist = childlist()
-            
-        if not isinstance(childlist, util.HistoryArraySet):
+            childlist = UOWListElement(obj, childlist())
+            obj.__dict__[key] = childlist                        
+        elif not isinstance(childlist, util.HistoryArraySet):
             childlist = UOWListElement(obj, childlist)
             obj.__dict__[key] = childlist
         if data is not None and childlist.data != data: