From 752359936645a6308beb52e77dbdbfad9929a301 Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 12 Dec 2013 13:36:25 -0500
Subject: make the error message for [ticket:2889] more accurate, as we support
 composites to many-to-ones now also

---
 lib/sqlalchemy/orm/descriptor_props.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/sqlalchemy')

diff --git a/lib/sqlalchemy/orm/descriptor_props.py b/lib/sqlalchemy/orm/descriptor_props.py
index 231e531e4..8a95cbf94 100644
--- a/lib/sqlalchemy/orm/descriptor_props.py
+++ b/lib/sqlalchemy/orm/descriptor_props.py
@@ -247,7 +247,7 @@ class CompositeProperty(DescriptorProperty):
                 prop = attr.property
             else:
                 raise sa_exc.ArgumentError(
-                        "Composite expects Column or Column-bound "
+                        "Composite expects Column objects or mapped "
                         "attributes/attribute names as arguments, got: %r"
                         % (attr,))
             props.append(prop)
-- 
cgit v1.2.1