Skip to content

Bugfix: Encode Decimal objects correctly #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
luke-jr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bugfix: Encode Decimal objects correctly #63

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions bitcoinrpc/authproxy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,22 @@ def __repr__(self):
return '<%s \'%s\'>' % (self.__class__.__name__, self)


def EncodeDecimal(o):
if isinstance(o, decimal.Decimal):
return float(round(o, 8))
raise TypeError(repr(o) + " is not JSON serializable")
class DecimalEncoder(float):
def __init__(self, o):
self.o = o
def __repr__(self):
return str(self.o)

class JSONEncoderWithDecimalCls(json.JSONEncoder):
def default(self, o):
if isinstance(o, decimal.Decimal):
return DecimalEncoder(o)
return json.JSONEncoder.default(self, o)

JSONEncoderWithDecimal = JSONEncoderWithDecimalCls()

def jsondumps(o):
return ''.join(JSONEncoderWithDecimal.iterencode(o))

class AuthServiceProxy(object):
__id_count = 0
Expand Down Expand Up @@ -124,11 +136,11 @@ def __call__(self, *args):
AuthServiceProxy.__id_count += 1

log.debug("-%s-> %s %s"%(AuthServiceProxy.__id_count, self.__service_name,
json.dumps(args, default=EncodeDecimal)))
postdata = json.dumps({'version': '1.1',
jsondumps(args)))
postdata = jsondumps({'version': '1.1',
'method': self.__service_name,
'params': args,
'id': AuthServiceProxy.__id_count}, default=EncodeDecimal)
'id': AuthServiceProxy.__id_count})
self.__conn.request('POST', self.__url.path, postdata,
{'Host': self.__url.hostname,
'User-Agent': USER_AGENT,
Expand Down Expand Up @@ -157,7 +169,7 @@ def batch_(self, rpc_calls):
m = rpc_call.pop(0)
batch_data.append({"jsonrpc":"2.0", "method":m, "params":rpc_call, "id":AuthServiceProxy.__id_count})

postdata = json.dumps(batch_data, default=EncodeDecimal)
postdata = jsondumps(batch_data)
log.debug("--> "+postdata)
self.__conn.request('POST', self.__url.path, postdata,
{'Host': self.__url.hostname,
Expand Down Expand Up @@ -185,7 +197,7 @@ def _get_response(self):
responsedata = http_response.read().decode('utf8')
response = json.loads(responsedata, parse_float=decimal.Decimal)
if "error" in response and response["error"] is None:
log.debug("<-%s- %s"%(response["id"], json.dumps(response["result"], default=EncodeDecimal)))
log.debug("<-%s- %s"%(response["id"], jsondumps(response["result"])))
else:
log.debug("<-- "+responsedata)
return response