From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 28 Mar 2011 01:14:06 +0000 (-0400)
Subject: - and fix the message that was the actual subject of [ticket:2063]
X-Git-Tag: rel_0_7b4~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90aa366fb3731892fd75455c81cdcc9e11268130;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- and fix the message that was the actual subject of [ticket:2063]
---

diff --git a/lib/sqlalchemy/orm/dependency.py b/lib/sqlalchemy/orm/dependency.py
index 023b3e07e2..44858fb852 100644
--- a/lib/sqlalchemy/orm/dependency.py
+++ b/lib/sqlalchemy/orm/dependency.py
@@ -268,9 +268,15 @@ class DependencyProcessor(object):
                     })
             else:
                 raise exc.FlushError(
-                "Attempting to flush an item of type %s on collection '%s', "
-                "whose mapper does not inherit from that of %s." % 
-                (state.class_, self.prop, self.mapper.class_))
+                    'Attempting to flush an item of type '
+                    '%(x)s as a member of collection '
+                    '"%(y)s". Expected an object of type '
+                    '%(z)s or a polymorphic subclass of '
+                    'this type.' % {
+                        'x': state.class_,
+                        'y': self.prop,
+                        'z': self.mapper.class_,
+                    })
 
     def _synchronize(self, state, child, associationrow,
                                             clearkeys, uowcommit):