From: Malthe Borch <mborch@gmail.com>
Date: Thu, 30 Oct 2014 09:49:37 +0000 (+0100)
Subject: It's the 'kwargs' which are iterable, not 'keys'
X-Git-Tag: rel_1_0_0b1~70^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02c072edbb1eaa826632e70174eb96915bb725b5;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

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

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index f070608255..c651812bd3 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -1760,8 +1760,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)