dash/blackcoin-more
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test_framework: python3.4 authproxy compat

Browse Source 
Github-Pull: #7751
Rebased-From: d7b80b54fb e7e48ba66c
This commit is contained in:
Wladimir J. van der Laan
2016-03-28 11:44:19 +02:00
committed by MarcoFalke
parent 80b6bfaeaa
commit afbc000b0b
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
qa/rpc-tests/test_framework/authproxy.py
View File

@@ -61,7 +61,7 @@ class JSONRPCException(Exception):
def EncodeDecimal(o): def EncodeDecimal(o):
if isinstance(o, decimal.Decimal): if isinstance(o, decimal.Decimal):
return round(o, 8) return str(o)
raise TypeError(repr(o) + " is not JSON serializable") raise TypeError(repr(o) + " is not JSON serializable")
class AuthServiceProxy(object): class AuthServiceProxy(object):
@@ -92,11 +92,10 @@ class AuthServiceProxy(object):
self.__conn = connection self.__conn = connection
elif self.__url.scheme == 'https': elif self.__url.scheme == 'https':
self.__conn = httplib.HTTPSConnection(self.__url.hostname, port, self.__conn = httplib.HTTPSConnection(self.__url.hostname, port,
None, None, False, timeout=timeout)
timeout)
else: else:
self.__conn = httplib.HTTPConnection(self.__url.hostname, port, self.__conn = httplib.HTTPConnection(self.__url.hostname, port,
False, timeout) timeout=timeout)
def __getattr__(self, name): def __getattr__(self, name):
if name.startswith('__') and name.endswith('__'): if name.startswith('__') and name.endswith('__'):