diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-06-23 17:48:28 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-06-23 17:48:28 -0400 |
| commit | 1f42aca57182e524487a500a6b49d495cda1e1b6 (patch) | |
| tree | 3bf9199b75457244bf5ef25b35b0622c94e3d69f /lib/sqlalchemy/ext/mutable.py | |
| parent | 2c33e2b59b84aee91ea52026c96477d2793a8590 (diff) | |
| parent | a2a570e9f48e1f6adf5f41fef1d837a37bbf905d (diff) | |
| download | sqlalchemy-1f42aca57182e524487a500a6b49d495cda1e1b6.tar.gz | |
Merge branch 'master' of https://github.com/asldevi/sqlalchemy into some_branch
Diffstat (limited to 'lib/sqlalchemy/ext/mutable.py')
| -rw-r--r-- | lib/sqlalchemy/ext/mutable.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/ext/mutable.py b/lib/sqlalchemy/ext/mutable.py index ca27f172f..48c8d13cc 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_) |