summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine/default.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/engine/default.py')
-rw-r--r--lib/sqlalchemy/engine/default.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py
index 1f2001e05..af1e42f38 100644
--- a/lib/sqlalchemy/engine/default.py
+++ b/lib/sqlalchemy/engine/default.py
@@ -180,8 +180,10 @@ class DefaultExecutionContext(base.ExecutionContext):
return params
else:
def proc(d):
- if d is None:
- return None
+ # sigh, sometimes we get positional arguments with a dialect
+ # that doesnt specify positional (because of execute_text())
+ if not isinstance(d, dict):
+ return d
return dict([(k.encode(self.dialect.encoding), d[k]) for k in d])
if isinstance(params, list):
return [proc(d) for d in params]