diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-05-26 17:18:27 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-05-26 17:18:27 -0400 |
| commit | 2ddcd20267c8b1742783c46522cf257d5cd6d4fd (patch) | |
| tree | 541e58eae5495a9cc34f779a7916b3ef12f7787c /lib/sqlalchemy/sql/expression.py | |
| parent | 4e930a7f780f0997e8f7f9ef4efe5c57ad86efd0 (diff) | |
| parent | e2b8c893ca98bb0141405a7d7d40c4024d5bdf41 (diff) | |
| download | sqlalchemy-2ddcd20267c8b1742783c46522cf257d5cd6d4fd.tar.gz | |
Merge branch 'master' into rel_0_9
Diffstat (limited to 'lib/sqlalchemy/sql/expression.py')
| -rw-r--r-- | lib/sqlalchemy/sql/expression.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index de8f08f9b..72879f6e4 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -2486,7 +2486,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) |