From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 15 Oct 2011 19:22:21 +0000 (-0400)
Subject: fix this test for oursql
X-Git-Tag: rel_0_7_3~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c6f6e2b7718ebc6c230f1b555bece592f1d8340;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fix this test for oursql
---

diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py
index 3ae4204d21..49457644ac 100644
--- a/test/engine/test_execute.py
+++ b/test/engine/test_execute.py
@@ -241,11 +241,11 @@ class ExecuteTest(fixtures.TestBase):
 
     def test_unicode_test_fails_warning(self):
         class MockCursor(engines.DBAPIProxyCursor):
-            def execute(self, stmt, params=None):
+            def execute(self, stmt, params=None, **kw):
                 if "test unicode returns" in stmt:
                     raise self.engine.dialect.dbapi.DatabaseError("boom")
                 else:
-                    return super(MockCursor, self).execute(stmt, params)
+                    return super(MockCursor, self).execute(stmt, params, **kw)
         eng = engines.proxying_engine(cursor_cls=MockCursor)
         assert_raises_message(
             tsa.exc.SAWarning,
diff --git a/test/lib/engines.py b/test/lib/engines.py
index 69fdeb3370..649c3e31af 100644
--- a/test/lib/engines.py
+++ b/test/lib/engines.py
@@ -267,14 +267,14 @@ class DBAPIProxyCursor(object):
         self.connection = conn
         self.cursor = conn.cursor()
 
-    def execute(self, stmt, parameters=None):
+    def execute(self, stmt, parameters=None, **kw):
         if parameters:
-            return self.cursor.execute(stmt, parameters)
+            return self.cursor.execute(stmt, parameters, **kw)
         else:
-            return self.cursor.execute(stmt)
+            return self.cursor.execute(stmt, **kw)
 
-    def executemany(self, stmt, params):
-        return self.cursor.executemany(stmt, params)
+    def executemany(self, stmt, params, **kw):
+        return self.cursor.executemany(stmt, params, **kw)
 
     def __getattr__(self, key):
         return getattr(self.cursor, key)
@@ -283,7 +283,7 @@ class DBAPIProxyConnection(object):
     """Proxy a DBAPI connection.
     
     Tests can provide subclasses of this to intercept
-    DBAPI-level cursor operations.
+    DBAPI-level connection operations.
     
     """
     def __init__(self, engine, cursor_cls):