From 786c5fe31672a0aebd49ba97f7a79ccdddad6ba1 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sun, 23 Jun 2013 17:53:49 -0400 Subject: - add a test for pullreq 8 - simplify --- lib/sqlalchemy/ext/mutable.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/sqlalchemy/ext/mutable.py') diff --git a/lib/sqlalchemy/ext/mutable.py b/lib/sqlalchemy/ext/mutable.py index 48c8d13cc..d3133b1f5 100644 --- a/lib/sqlalchemy/ext/mutable.py +++ b/lib/sqlalchemy/ext/mutable.py @@ -588,11 +588,11 @@ 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 (type(prop.composite_class) in (types.ClassType, types.TypeType)) and - issubclass(prop.composite_class, MutableComposite)): + if (hasattr(prop, 'composite_class') and + isinstance(prop.composite_class, type) and + issubclass(prop.composite_class, MutableComposite)): prop.composite_class._listen_on_attribute( getattr(class_, prop.key), False, class_) if not Mapper.dispatch.mapper_configured._contains(Mapper, _listen_for_type): -- cgit v1.2.1