From 752359936645a6308beb52e77dbdbfad9929a301 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 12 Dec 2013 13:36:25 -0500 Subject: [PATCH] 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 +- test/orm/test_composites.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/sqlalchemy/orm/descriptor_props.py b/lib/sqlalchemy/orm/descriptor_props.py index 231e531e43..8a95cbf94c 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) diff --git a/test/orm/test_composites.py b/test/orm/test_composites.py index 8946b6908d..f13720ef38 100644 --- a/test/orm/test_composites.py +++ b/test/orm/test_composites.py @@ -751,7 +751,7 @@ class ConfigurationTest(fixtures.MappedTest): # note that we also are checking that the tuple # renders here, so the "%" operator in the string needs to # apply the tuple also - r"Composite expects Column or Column-bound " + r"Composite expects Column objects or mapped " "attributes/attribute names as " "arguments, got: \(Column", configure_mappers -- 2.47.3