From 7b9134be7129346e486a5caca7bdc87de7ccf015 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sun, 8 Feb 2015 19:58:34 -0500 Subject: - test + changelog --- lib/sqlalchemy/orm/query.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/sqlalchemy') diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 3680f47eb..07f949d8e 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)) + ', '.join(sorted(kwargs))) isouter = isouter return self._join(props, outerjoin=isouter, create_aliases=aliased, @@ -1792,7 +1792,7 @@ class Query(object): kwargs.pop('from_joinpoint', False) if kwargs: raise TypeError("unknown arguments: %s" % - ','.join(kwargs)) + ', '.join(sorted(kwargs))) return self._join(props, outerjoin=True, create_aliases=aliased, from_joinpoint=from_joinpoint) -- cgit v1.2.1