Changeset: ca7674824097 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ca7674824097
Modified Files:
clients/mapiclient/dump.c
clients/mapiclient/mclient.c
clients/python2/monetdb/sql/monetize.py
clients/python3/monetdb/sql/monetize.py
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (24 lines):
diff --git a/clients/python2/monetdb/sql/monetize.py
b/clients/python2/monetdb/sql/monetize.py
--- a/clients/python2/monetdb/sql/monetize.py
+++ b/clients/python2/monetdb/sql/monetize.py
@@ -88,7 +88,7 @@ def convert(data):
else:
for type_, func in mapping:
if issubclass(type(data), type_):
- return func
+ return func(data)
#if hasattr(data, '__str__'):
# return monet_escape
raise ProgrammingError("type %s not supported as value" % type(data))
diff --git a/clients/python3/monetdb/sql/monetize.py
b/clients/python3/monetdb/sql/monetize.py
--- a/clients/python3/monetdb/sql/monetize.py
+++ b/clients/python3/monetdb/sql/monetize.py
@@ -84,7 +84,7 @@ def convert(data):
else:
for type_, func in mapping:
if issubclass(type(data), type_):
- return func
+ return func(data)
#if hasattr(data, '__str__'):
# return monet_escape
raise ProgrammingError("type %s not supported as value" % type(data))
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
