[Python-checkins] cpython (merge default -> default): Merge

[steven.bethard]

http://hg.python.org/cpython/rev/838e3b07a7f8
changeset:   69128:838e3b07a7f8
parent:      69127:1f3f6443810a
parent:      69124:ce37570768f5
user:        Steven Bethard <steven.bethard at gmail.com>
date:        Mon Apr 04 02:14:25 2011 +0200
summary:
  Merge

files:
  Lib/sqlite3/test/hooks.py |  5 ++++-
  1 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/Lib/sqlite3/test/hooks.py b/Lib/sqlite3/test/hooks.py
--- a/Lib/sqlite3/test/hooks.py
+++ b/Lib/sqlite3/test/hooks.py
@@ -213,7 +213,10 @@
             traced_statements.append(statement)
         con.set_trace_callback(trace)
         con.execute("create table foo(x)")
-        con.execute("insert into foo(x) values (?)", (unicode_value,))
+        # Can't execute bound parameters as their values don't appear
+        # in traced statements before SQLite 3.6.21
+        # (cf. http://www.sqlite.org/draft/releaselog/3_6_21.html)
+        con.execute('insert into foo(x) values ("%s")' % unicode_value)
         con.commit()
         self.assertTrue(any(unicode_value in stmt for stmt in traced_statements),
                         "Unicode data %s garbled in trace callback: %s"

-- 
Repository URL: http://hg.python.org/cpython