From: Devi <asldevi@gmail.com>
Date: Wed, 19 Jun 2013 10:33:23 +0000 (+0530)
Subject: check if compostite_class is of class type
X-Git-Tag: rel_0_9_0b1~235^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27d99728293f066d4ad2fc61775454d4d4b71b33;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

check if compostite_class is of class type

before checking if it is a subclass of `MutableComposite`
---

diff --git a/lib/sqlalchemy/ext/mutable.py b/lib/sqlalchemy/ext/mutable.py
index ca27f172f3..f503ad6d44 100644
--- a/lib/sqlalchemy/ext/mutable.py
+++ b/lib/sqlalchemy/ext/mutable.py
@@ -588,9 +588,10 @@ class MutableComposite(MutableBase):
                 setattr(parent, attr_name, value)
 
 def _setup_composite_listener():
+    import types
     def _listen_for_type(mapper, class_):
         for prop in mapper.iterate_properties:
-            if (hasattr(prop, 'composite_class') and
+            if (hasattr(prop, 'composite_class') and (type(prop.composite_class) is types.ClassType) and
                 issubclass(prop.composite_class, MutableComposite)):
                 prop.composite_class._listen_on_attribute(
                     getattr(class_, prop.key), False, class_)