test_framework: python3.4 authproxy compat

Github-Pull: #7751
Rebased-From: d7b80b54fbb73acc92ddee84697ac4cc10d4d336 e7e48ba66cb597621a30945da9ca7fc36a6dc84c
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

View File

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