From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 23 Jun 2013 21:48:28 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/asldevi/sqlalchemy into some_branch
X-Git-Tag: rel_0_8_2~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=decc72ee0e9416958284f3101528f27e61a6039f;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Merge branch 'master' of https://github.com/asldevi/sqlalchemy into some_branch
---

diff --git a/lib/sqlalchemy/ext/mutable.py b/lib/sqlalchemy/ext/mutable.py
index ca27f172f3..48c8d13ccc 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) in (types.ClassType, types.TypeType)) and
                 issubclass(prop.composite_class, MutableComposite)):
                 prop.composite_class._listen_on_attribute(
                     getattr(class_, prop.key), False, class_)