diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-04-26 15:04:54 -0400 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-04-26 15:04:54 -0400 |
commit | 34dc02773b6bdb2751b301146f2f3c9a938d4cbb (patch) | |
tree | dabfc3b285816838d45a8cf447b25fa017c8a0e2 /lib/sqlalchemy/sql/expression.py | |
parent | 0f26f549191fc74bfebac319b39323cb865f7a50 (diff) | |
parent | 22c4ae0aaf3a00e9020c3950a53d2a3238b2091c (diff) | |
download | sqlalchemy-34dc02773b6bdb2751b301146f2f3c9a938d4cbb.tar.gz |
merge default
Diffstat (limited to 'lib/sqlalchemy/sql/expression.py')
-rw-r--r-- | lib/sqlalchemy/sql/expression.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index d2e644ce2..7846ac3b2 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -3909,7 +3909,7 @@ class Join(FromClause): def is_derived_from(self, fromclause): return fromclause is self or \ - self.left.is_derived_from(fromclause) or\ + self.left.is_derived_from(fromclause) or \ self.right.is_derived_from(fromclause) def self_group(self, against=None): |