(no commit message)

diff --git a/lib/sqlalchemy/attributes.py b/lib/sqlalchemy/attributes.py
index f3fd1b558a25eb0a984c2519672d4a180de118c1..aa768532de36143454be3d52c1e8872cc24b9798 100644 (file)
--- a/lib/sqlalchemy/attributes.py
+++ b/lib/sqlalchemy/attributes.py
@@ -202,6 +202,8 @@ class AttributeManager(object):
         return self.get_history(obj, key, **kwargs)
         
     def set_attribute(self, obj, key, value, **kwargs):
+        if key == 'parent' and value is not None and value.__class__.__name__ != 'Comment':
+            raise "wha?"
         self.get_history(obj, key, **kwargs).setattr(value)
         self.value_changed(obj, key, value)
     

diff --git a/lib/sqlalchemy/objectstore.py b/lib/sqlalchemy/objectstore.py
index a84d5ca77c0253ea67b1e26c8452d7e5c9ddae26..1ced8a593cf54fea5cbfc9c84a03584fb90c6299 100644 (file)
--- a/lib/sqlalchemy/objectstore.py
+++ b/lib/sqlalchemy/objectstore.py
@@ -352,7 +352,7 @@ class UOWTransaction(object):
             task.mapper.register_dependencies(self)
 
         head = self._sort_dependencies()
-        print "Task dump:\n" + head.dump()
+        #print "Task dump:\n" + head.dump()
         if head is not None:
             head.execute(self)