- cleaned up the attributes scan for reconstitute hooks

- added more careful check for "_should_exclude", guard against possible heisenbug activity

1 files changed, 14 insertions, 0 deletions

diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py
index a9e7d2238..76c73ca6a 100644
--- a/lib/sqlalchemy/util.py
+++ b/lib/sqlalchemy/util.py
@@ -410,6 +410,20 @@ def class_hierarchy(cls):
             hier.add(s)
     return list(hier)
 
+def iterate_attributes(cls):
+    """iterate all the keys and attributes associated with a class, without using getattr().
+    
+    Does not use getattr() so that class-sensitive descriptors (i.e. property.__get__())
+    are not called.
+    
+    """
+    keys = dir(cls)
+    for key in keys:
+        for c in cls.__mro__:
+            if key in c.__dict__:
+                yield (key, c.__dict__[key])
+                break
+                
 # from paste.deploy.converters
 def asbool(obj):
     if isinstance(obj, (str, unicode)):