summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine/base.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2008-12-28 20:58:38 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2008-12-28 20:58:38 +0000
commit7009653aa1c53d1f761501522d55617d3fdcc57c (patch)
tree159c2801acdfdd812ad82f8349be8e6f4ce0e1d9 /lib/sqlalchemy/engine/base.py
parentd245397bd2ba562993f1c9b5880f1c818050585c (diff)
downloadsqlalchemy-7009653aa1c53d1f761501522d55617d3fdcc57c.tar.gz
- RowProxy objects can be used in place of dictionary arguments
sent to connection.execute() and friends. [ticket:935]
Diffstat (limited to 'lib/sqlalchemy/engine/base.py')
-rw-r--r--lib/sqlalchemy/engine/base.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index 7af74ec7b..24fd1cc6e 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -835,16 +835,16 @@ class Connection(Connectable):
elif len(multiparams) == 1:
zero = multiparams[0]
if isinstance(zero, (list, tuple)):
- if not zero or isinstance(zero[0], (list, tuple, dict)):
+ if not zero or hasattr(zero[0], '__iter__'):
return zero
else:
return [zero]
- elif isinstance(zero, dict):
+ elif hasattr(zero, 'keys'):
return [zero]
else:
return [[zero]]
else:
- if isinstance(multiparams[0], (list, tuple, dict)):
+ if hasattr(multiparams[0], '__iter__'):
return multiparams
else:
return [multiparams]