diff options
| author | Malthe Borch <mborch@gmail.com> | 2014-10-30 10:49:37 +0100 |
|---|---|---|
| committer | Malthe Borch <mborch@gmail.com> | 2014-10-30 10:49:37 +0100 |
| commit | 02c072edbb1eaa826632e70174eb96915bb725b5 (patch) | |
| tree | 2d8b19f558c84589a1a4431d0f7c6b69264d23d8 | |
| parent | d2c1edfb15334a2fb6ada5b064563c144ac22ad7 (diff) | |
| download | sqlalchemy-pr/147.tar.gz | |
It's the 'kwargs' which are iterable, not 'keys'pr/147
| -rw-r--r-- | lib/sqlalchemy/orm/query.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index f07060825..c651812bd 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) |