From 1cf80dc5b273dc92607863bdd3af859840aa3364 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Wed, 14 Sep 2011 11:31:33 -0400 Subject: - 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] --- lib/sqlalchemy/sql/expression.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/sqlalchemy/sql/expression.py') 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) -- cgit v1.2.1