(no commit message)

diff --git a/lib/sqlalchemy/objectstore.py b/lib/sqlalchemy/objectstore.py
index 24bccf43236c16421165d80ae34c277726c1430e..638f910c4a34bb7763a3ee93fad28adfbdf9b9c6 100644 (file)
--- a/lib/sqlalchemy/objectstore.py
+++ b/lib/sqlalchemy/objectstore.py
@@ -70,7 +70,7 @@ def has_key(key):
 
 class UOWSmartProperty(attributes.SmartProperty):
     def attribute_registry(self):
-        return uow().attributes
+        return global_attributes
     
 class UOWListElement(attributes.ListElement):
     def __init__(self, obj, key, data=None, deleteremoved=False):
@@ -109,11 +109,10 @@ class UnitOfWork(object):
         self.is_begun = is_begun
         if parent is not None:
             self.identity_map = parent.identity_map
-            self.attributes = parent.attributes
         else:
             self.identity_map = {}
-            self.attributes = UOWAttributeManager()
             
+        self.attributes = global_attributes
         self.new = util.HashSet(ordered = True)
         self.dirty = util.HashSet()
         self.modified_lists = util.HashSet()
@@ -582,5 +581,5 @@ def object_mapper(obj):
     return sqlalchemy.mapper.object_mapper(obj)
                     
 uow = util.ScopedRegistry(lambda: UnitOfWork(), "thread")
-
+global_attributes = UOWAttributeManager()