diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2011-09-14 11:31:33 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2011-09-14 11:31:33 -0400 |
| commit | 1cf80dc5b273dc92607863bdd3af859840aa3364 (patch) | |
| tree | 7529a14e1fae87a3d024fddd667efe4c757576de /lib/sqlalchemy/sql/expression.py | |
| parent | 98a08bf207c21a4bc06c2ec6fbda9819f59dc751 (diff) | |
| download | sqlalchemy-1cf80dc5b273dc92607863bdd3af859840aa3364.tar.gz | |
- Changed the update() method on association proxy
dictionary to use a duck typing approach, i.e.
checks for "keys", to discern between update({})
and update((a, b)). Previously, passing a
dictionary that had tuples as keys would be misinterpreted
as a sequence. [ticket:2275]
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 9e920c34f..84fcbd569 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -4699,7 +4699,7 @@ class Select(_SelectBase): """ self._should_correlate = False - if fromclauses == (None,): + if fromclauses and fromclauses[0] is None: self._correlate = set() else: self._correlate = self._correlate.union(fromclauses) |