diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-02-08 19:50:41 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-02-08 19:50:41 -0500 |
| commit | a7c8cf0f2f456485a358d6b9ffe69516b8164bcd (patch) | |
| tree | 691938575127faf704c515f88e13658ab6b56ee8 | |
| parent | ab1f7d20589412edc1cf00f8aeab8886ed368a0c (diff) | |
| parent | 02c072edbb1eaa826632e70174eb96915bb725b5 (diff) | |
| download | sqlalchemy-a7c8cf0f2f456485a358d6b9ffe69516b8164bcd.tar.gz | |
Merge remote-tracking branch 'origin/pr/147' into pr147
Conflicts:
lib/sqlalchemy/orm/query.py
| -rw-r--r-- | lib/sqlalchemy/orm/query.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 60a637952..3680f47eb 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -1775,7 +1775,7 @@ class Query(object): kwargs.pop('isouter', False) if kwargs: raise TypeError("unknown arguments: %s" % - ','.join(kwargs.keys)) + ','.join(kwargs)) isouter = isouter return self._join(props, outerjoin=isouter, create_aliases=aliased, |