It's the 'kwargs' which are iterable, not 'keys'

(cherry picked from commit 02c072edbb1eaa826632e70174eb96915bb725b5)

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 4d1eec108ce64990579e9ab0290e1cea68479a11..72dd9db2bfaafd767e21d02635f945252b1a6693 100644 (file)
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -1717,8 +1717,7 @@ class Query(object):
         aliased, from_joinpoint = kwargs.pop('aliased', False),\
             kwargs.pop('from_joinpoint', False)
         if kwargs:
-            raise TypeError("unknown arguments: %s" %
-                            ','.join(kwargs.keys))
+            raise TypeError("unknown arguments: %s" % ', '.join(kwargs))
         return self._join(props,
                           outerjoin=False, create_aliases=aliased,
                           from_joinpoint=from_joinpoint)