From e2b8c893ca98bb0141405a7d7d40c4024d5bdf41 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sun, 26 May 2013 17:18:04 -0400 Subject: [PATCH] fix this test --- lib/sqlalchemy/sql/expression.py | 2 +- test/sql/test_selectable.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index 3644cabc39..3f9aef2b78 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -2485,7 +2485,7 @@ class ColumnCollection(util.OrderedProperties): existing = self[key] if not existing.shares_lineage(value): util.warn('Column %r on table %r being replaced by ' - '%r , which has the same key. Consider ' + '%r, which has the same key. Consider ' 'use_labels for select() statements.' % (key, getattr(existing, 'table', None), value)) self._all_cols.remove(existing) diff --git a/test/sql/test_selectable.py b/test/sql/test_selectable.py index e881298a77..183b721110 100644 --- a/test/sql/test_selectable.py +++ b/test/sql/test_selectable.py @@ -1592,7 +1592,7 @@ class WithLabelsTest(fixtures.TestBase): def _assert_labels_warning(self, s): assert_raises_message( exc.SAWarning, - "replaced by another column with the same key", + r"replaced by Column.*, which has the same key", lambda: s.c ) -- 2.47.3