summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/util.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/orm/util.py')
-rw-r--r--lib/sqlalchemy/orm/util.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py
index a3912d133..37c88907b 100644
--- a/lib/sqlalchemy/orm/util.py
+++ b/lib/sqlalchemy/orm/util.py
@@ -593,9 +593,11 @@ def _is_mapped_class(cls):
return True
if isinstance(cls, expression.ClauseElement):
return False
- manager = attributes.manager_of_class(cls)
- return manager and _INSTRUMENTOR in manager.info
-
+ if isinstance(cls, type):
+ manager = attributes.manager_of_class(cls)
+ return manager and _INSTRUMENTOR in manager.info
+ return False
+
def instance_str(instance):
"""Return a string describing an instance."""