Changeset: 6b5168968b79 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6b5168968b79
Modified Files:
clients/python/monetdb/mapi.py
clients/python/test/dbapi20.py
clients/python3/monetdb/mapi.py
clients/python3/test/dbapi20.py
Branch: default
Log Message:
dbapi20 tests didn't use environment settings
diffs (86 lines):
diff --git a/clients/python/monetdb/mapi.py b/clients/python/monetdb/mapi.py
--- a/clients/python/monetdb/mapi.py
+++ b/clients/python/monetdb/mapi.py
@@ -86,7 +86,7 @@ class Server(object):
self.socket.connect((hostname, port))
except socket.error, error:
(error_code, error_str) = error
- raise OperationalError(error_str + " (%s)" % error_code)
+ raise OperationalError(error_str + " (%s:%s)" % (self.hostname,
self.port))
self.__login()
diff --git a/clients/python/test/dbapi20.py b/clients/python/test/dbapi20.py
--- a/clients/python/test/dbapi20.py
+++ b/clients/python/test/dbapi20.py
@@ -106,7 +106,7 @@ class DatabaseAPI20Test(unittest.TestCas
The 'Optional Extensions' are not yet being tested.
self.drivers should subclass this test, overriding setUp, tearDown,
- self.driver, connect_args and connect_kw_args. Class specification
+ self.driver, connect_args and connect_kwargs. Class specification
should be as follows:
import dbapi20
@@ -121,7 +121,7 @@ class DatabaseAPI20Test(unittest.TestCas
# method is to be found
driver = None
connect_args = () # List of arguments to pass to connect
- connect_kw_args = {} # Keyword arguments for connect
+ connect_kwargs = {} # Keyword arguments for connect
table_prefix = 'dbapi20test_' # If you need to specify a prefix for tables
ddl1 = 'create table %sbooze (name varchar(20))' % table_prefix
@@ -165,9 +165,7 @@ class DatabaseAPI20Test(unittest.TestCas
def _connect(self):
try:
- return self.driver.connect(
- *self.connect_args,**self.connect_kw_args
- )
+ return self.driver.connect(*self.connect_args,
**self.connect_kwargs)
except AttributeError:
self.fail("No connect method found in self.driver module")
diff --git a/clients/python3/monetdb/mapi.py b/clients/python3/monetdb/mapi.py
--- a/clients/python3/monetdb/mapi.py
+++ b/clients/python3/monetdb/mapi.py
@@ -76,7 +76,7 @@ class Server:
self.socket.connect((hostname, port))
except socket.error as error:
(error_code, error_str) = error
- raise OperationalError(error_str)
+ raise OperationalError(error_str + "(%s:%s)" % (self.hostname,
self.port))
self.__login()
diff --git a/clients/python3/test/dbapi20.py b/clients/python3/test/dbapi20.py
--- a/clients/python3/test/dbapi20.py
+++ b/clients/python3/test/dbapi20.py
@@ -106,7 +106,7 @@ class DatabaseAPI20Test(unittest.TestCas
The 'Optional Extensions' are not yet being tested.
self.drivers should subclass this test, overriding setUp, tearDown,
- self.driver, connect_args and connect_kw_args. Class specification
+ self.driver, connect_args and connect_kwargs. Class specification
should be as follows:
import dbapi20
@@ -121,7 +121,7 @@ class DatabaseAPI20Test(unittest.TestCas
# method is to be found
driver = None
connect_args = () # List of arguments to pass to connect
- connect_kw_args = {} # Keyword arguments for connect
+ connect_kwargs = {} # Keyword arguments for connect
table_prefix = 'dbapi20test_' # If you need to specify a prefix for tables
ddl1 = 'create table %sbooze (name varchar(20))' % table_prefix
@@ -166,7 +166,7 @@ class DatabaseAPI20Test(unittest.TestCas
def _connect(self):
try:
return self.driver.connect(
- *self.connect_args,**self.connect_kw_args
+ *self.connect_args,**self.connect_kwargs
)
except AttributeError:
self.fail("No connect method found in self.driver module")
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
