From 6a6851c39cc480f8c6e52f10927f1896f0b66dcf Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 11 Jun 2012 20:48:26 -0400 Subject: [PATCH] sigh. go back to __iter__ because of silly rowproxy as argument requirement --- lib/sqlalchemy/engine/base.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py index 5254b9ba5f..173ee0b939 100644 --- a/lib/sqlalchemy/engine/base.py +++ b/lib/sqlalchemy/engine/base.py @@ -1473,7 +1473,8 @@ 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__') and \ + not hasattr(zero[0], 'strip'): return zero else: return [zero] @@ -1482,7 +1483,8 @@ class Connection(Connectable): else: return [[zero]] else: - if isinstance(multiparams[0], (list, tuple, dict)): + if hasattr(multiparams[0], '__iter__') and \ + not hasattr(multiparams[0], 'strip'): return multiparams else: return [multiparams] -- 2.47.2