From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 2 Dec 2018 23:54:40 +0000 (-0500)
Subject: "left" -> "accidentally placed at"
X-Git-Tag: rel_1_3_0b2~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eacb31a89fe883edd0ada7f2724239c1f8c5b685;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

"left" -> "accidentally placed at"

since "left" is kind of ambiguous, use more explicit terminology
here.

Also update the test to use a positive assertion that the
warning is emitted; quote the attribute name.

Change-Id: Ic2284c200a26b32b2da063cfaf6d59547309d587
References: https://github.com/zzzeek/sqlalchemy/pull/488
---

diff --git a/lib/sqlalchemy/ext/declarative/base.py b/lib/sqlalchemy/ext/declarative/base.py
index f1d75bb4b2..f27314b5e6 100644
--- a/lib/sqlalchemy/ext/declarative/base.py
+++ b/lib/sqlalchemy/ext/declarative/base.py
@@ -386,8 +386,8 @@ class _MapperConfig(object):
             if (isinstance(value, tuple) and len(value) == 1 and
                     isinstance(value[0], (Column, MapperProperty))):
                 util.warn("Ignoring declarative-like tuple value of attribute "
-                          "%s: possibly a copy-and-paste error with a comma "
-                          "left at the end of the line?" % k)
+                          "'%s': possibly a copy-and-paste error with a comma "
+                          "accidentally placed at the end of the line?" % k)
                 continue
             elif not isinstance(value, (Column, MapperProperty)):
                 # using @declared_attr for some object that
diff --git a/test/ext/declarative/test_basic.py b/test/ext/declarative/test_basic.py
index 611598413a..f45421ad9e 100644
--- a/test/ext/declarative/test_basic.py
+++ b/test/ext/declarative/test_basic.py
@@ -1170,23 +1170,17 @@ class DeclarativeTest(DeclarativeTestBase):
 
         eq_(Foo.__mapper__.CHECK, True)
 
-    @testing.emits_warning('Ignoring declarative-like tuple value of '
-                           'attribute id')
     def test_oops(self):
 
-        def define():
+        with testing.expect_warnings(
+            "Ignoring declarative-like tuple value of "
+                "attribute 'name'"):
 
             class User(Base, fixtures.ComparableEntity):
 
                 __tablename__ = 'users'
-                id = Column('id', Integer, primary_key=True),
-                name = Column('name', String(50))
-
-            assert False
-
-        assert_raises_message(sa.exc.ArgumentError,
-                              'Mapper Mapper|User|users could not '
-                              'assemble any primary key', define)
+                id = Column('id', Integer, primary_key=True)
+                name = Column('name', String(50)),
 
     def test_table_args_no_dict(self):