On 2012-12-14 12:10, Gijs Molenaar wrote:

Changeset: 81f191d61822 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=81f191d61822 Modified Files: clients/python2/monetdb/mapi.py clients/python3/monetdb/mapi.py Branch: default Log Message:

fixed a low level bug where empty mapi results where not properly handled

Is this is fix that should have gone to the Oct2012 branch? Please, make sure you fix bugs in the lowest branch where the bug occurs and that is still maintained. Currently the still maintained branches are Oct2012, Feb2013 and default.

diffs (30 lines):

diff --git a/clients/python2/monetdb/mapi.py b/clients/python2/monetdb/mapi.py --- a/clients/python2/monetdb/mapi.py +++ b/clients/python2/monetdb/mapi.py @@ -163,9 +163,9 @@ class Connection(object): self.__putblock(operation) response = self.__getblock() if not len(response): - return True + return "" elif response.startswith(MSG_OK): - return response[3:].strip() or True + return response[3:].strip() or ""

Isn't this equivalent to: return response[3:].strip()

if response == MSG_MORE: # tell server it isn't going to get more return self.cmd("") 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 @@ -163,9 +163,9 @@ class Connection(object): self.__putblock(operation) response = self.__getblock() if not len(response): - return True + return "" elif response.startswith(MSG_OK): - return response[3:].strip() or True + return response[3:].strip() or "" if response == MSG_MORE: # tell server it isn't going to get more return self.cmd("") _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list

-- Sjoerd Mullender _______________________________________________ developers-list mailing list developers-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/developers-list