allow to use 0 and 1 as boolean

This commit is contained in:
Jeanneret Cedric 2014-05-29 22:50:02 +02:00
parent cc21d629c9
commit 8790930fec

View File

@ -314,6 +314,8 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
raise APIError(0, 'Too many parameters!') raise APIError(0, 'Too many parameters!')
if len(passphrase) == 0: if len(passphrase) == 0:
raise APIError(1, 'The specified passphrase is blank.') raise APIError(1, 'The specified passphrase is blank.')
if isinstance(eighteenByteRipe, int) and eighteenByteRipe in [1,2]:
eighteenByteRipe = bool(eighteenByteRipe)
if not isinstance(eighteenByteRipe, bool): if not isinstance(eighteenByteRipe, bool):
raise APIError(23, 'Bool expected in eighteenByteRipe, saw %s instead' % type(eighteenByteRipe)) raise APIError(23, 'Bool expected in eighteenByteRipe, saw %s instead' % type(eighteenByteRipe))
passphrase = self._decode(passphrase, "base64") passphrase = self._decode(passphrase, "base64")
@ -483,6 +485,8 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
elif len(params) >= 2: elif len(params) >= 2:
msgid = self._decode(params[0], "hex") msgid = self._decode(params[0], "hex")
readStatus = params[1] readStatus = params[1]
if isinstance(readStatus, int) and readStatus in [1,2]:
readStatus = bool(readStatus)
if not isinstance(readStatus, bool): if not isinstance(readStatus, bool):
raise APIError(23, 'Bool expected in readStatus, saw %s instead.' % type(readStatus)) raise APIError(23, 'Bool expected in readStatus, saw %s instead.' % type(readStatus))
queryreturn = sqlQuery('''SELECT read FROM inbox WHERE msgid=?''', msgid) queryreturn = sqlQuery('''SELECT read FROM inbox WHERE msgid=?''', msgid)