skytools.quote_statement: accept arg list (from 2.2)
authorMarko Kreen <markokr@gmail.com>
Thu, 8 Jan 2009 19:59:11 +0000 (19:59 +0000)
committerMarko Kreen <markokr@gmail.com>
Thu, 8 Jan 2009 19:59:11 +0000 (19:59 +0000)
python/skytools/quoting.py

index a0c2c0d89f72ceb00a23065184e8bb31d0d71726..8225c7b06127b5602fef612e5674f0232217f512 100644 (file)
@@ -34,19 +34,15 @@ def quote_bytea_copy(s):
 
     return quote_copy(quote_bytea_raw(s))
 
-def quote_statement(sql, dict_or_list):
+def quote_statement(sql, dict):
     """Quote whole statement.
 
-    Data values are taken from dict or list or tuple.
+    Data values are taken from dict.
     """
-    if hasattr(dict_or_list, 'items'):
-        qvals = {}
-        for k, v in dict_or_list.items():
-            qvals[k] = quote_literal(v)
-    else:
-        qvals = [quote_literal(v) for v in dict_or_list]
-        qvals = tuple(qvals)
-    return sql % qvals
+    xdict = {}
+    for k, v in dict.items():
+        xdict[k] = quote_literal(v)
+    return sql % xdict
 
 # reserved keywords
 _ident_kwmap = {