From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 28 Feb 2010 16:46:42 +0000 (+0000)
Subject: - make tuple a little more friendly
X-Git-Tag: rel_0_6beta2~103
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fe99d56657a59d98cf5fabebb4b3bb92bf26e304;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- make tuple a little more friendly
---

diff --git a/lib/sqlalchemy/log.py b/lib/sqlalchemy/log.py
index 0d28af5e63..62e0739f7c 100644
--- a/lib/sqlalchemy/log.py
+++ b/lib/sqlalchemy/log.py
@@ -112,7 +112,8 @@ class echo_property(object):
         if instance is None:
             return self
         else:
-            return instance._should_log_debug and 'debug' or (instance._should_log_info and True or False)
+            return instance._should_log_debug and 'debug' or \
+                            (instance._should_log_info and True or False)
 
     def __set__(self, instance, value):
         instance_logger(instance, echoflag=value)
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index 0f55ac097d..f3a1562c55 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -2424,6 +2424,7 @@ class BooleanClauseList(ClauseList, ColumnElement):
 class _Tuple(ClauseList, ColumnElement):
     
     def __init__(self, *clauses, **kw):
+        clauses = [_literal_as_binds(c) for c in clauses]
         super(_Tuple, self).__init__(*clauses, **kw)
         self.type = _type_from_args(clauses)