From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 9 Feb 2015 00:50:41 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/pr/147' into pr147
X-Git-Tag: rel_1_0_0b1~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7c8cf0f2f456485a358d6b9ffe69516b8164bcd;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Merge remote-tracking branch 'origin/pr/147' into pr147

Conflicts:
	lib/sqlalchemy/orm/query.py
---

a7c8cf0f2f456485a358d6b9ffe69516b8164bcd
diff --cc lib/sqlalchemy/orm/query.py
index 60a6379521,c651812bd3..3680f47eb7
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@@ -1770,15 -1757,12 +1770,15 @@@ class Query(object)
              SQLAlchemy versions was the primary ORM-level joining interface.
  
          """
 -        aliased, from_joinpoint = kwargs.pop('aliased', False),\
 -            kwargs.pop('from_joinpoint', False)
 +        aliased, from_joinpoint, isouter = kwargs.pop('aliased', False),\
 +            kwargs.pop('from_joinpoint', False),\
 +            kwargs.pop('isouter', False)
          if kwargs:
 -            raise TypeError("unknown arguments: %s" % ', '.join(kwargs))
 +            raise TypeError("unknown arguments: %s" %
-                             ','.join(kwargs.keys))
++                            ','.join(kwargs))
 +        isouter = isouter
          return self._join(props,
 -                          outerjoin=False, create_aliases=aliased,
 +                          outerjoin=isouter, create_aliases=aliased,
                            from_joinpoint=from_joinpoint)
  
      def outerjoin(self, *props, **kwargs):