From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 14 Sep 2005 03:06:30 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: rel_0_1_0~744
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a78f45130c157b477833f442df3f7f257e03194e;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

---

diff --git a/lib/sqlalchemy/objectstore.py b/lib/sqlalchemy/objectstore.py
index 02d0f70b80..caa1ee9cfa 100644
--- a/lib/sqlalchemy/objectstore.py
+++ b/lib/sqlalchemy/objectstore.py
@@ -196,7 +196,10 @@ class UnitOfWork(object):
             childlist = UOWListElement(obj, childlist)
             obj.__dict__[key] = childlist
         if data is not None and childlist.data != data:
-            childlist.set_data(data)
+            try:
+                childlist.set_data(data)
+            except TypeError:
+                raise "object " + repr(data) + " is not an iterable object"
         return childlist
         
     def register_clean(self, obj):