summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-12-01 13:31:48 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2014-12-01 13:31:48 -0500
commit156f473de00024688404d73aea305cd4fc452638 (patch)
tree93d78f2dd852b90d295bd523fd0bc09a644ee0d2 /lib/sqlalchemy
parent98c2a679707432e6707ba70f1aebd10b28b861a3 (diff)
parent8d154f84f1a552c290a1ccd802f20940c8cab066 (diff)
downloadsqlalchemy-156f473de00024688404d73aea305cd4fc452638.tar.gz
Merge remote-tracking branch 'origin/pr/151' into pr151
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/testing/engines.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/sqlalchemy/testing/engines.py b/lib/sqlalchemy/testing/engines.py
index 1284f9c2a..0f6f59401 100644
--- a/lib/sqlalchemy/testing/engines.py
+++ b/lib/sqlalchemy/testing/engines.py
@@ -280,10 +280,10 @@ class DBAPIProxyCursor(object):
"""
- def __init__(self, engine, conn):
+ def __init__(self, engine, conn, *args, **kwargs):
self.engine = engine
self.connection = conn
- self.cursor = conn.cursor()
+ self.cursor = conn.cursor(*args, **kwargs)
def execute(self, stmt, parameters=None, **kw):
if parameters:
@@ -311,8 +311,8 @@ class DBAPIProxyConnection(object):
self.engine = engine
self.cursor_cls = cursor_cls
- def cursor(self):
- return self.cursor_cls(self.engine, self.conn)
+ def cursor(self, *args, **kwargs):
+ return self.cursor_cls(self.engine, self.conn, *args, **kwargs)
def close(self):
self.conn.close()