diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-03-28 11:44:19 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2016-06-09 23:55:27 +0200 |
| commit | afbc000b0bcf98050d45781bc07a71f3afc7e764 (patch) | |
| tree | b4cc721b4e837c75a414378210a77b0cc0653620 /qa | |
| parent | 80b6bfaeaa42b983a6b6503f28a280bad6e9a73b (diff) | |
| download | bitcoin-afbc000b0bcf98050d45781bc07a71f3afc7e764.tar.xz | |
test_framework: python3.4 authproxy compat
Github-Pull: #7751
Rebased-From: d7b80b54fbb73acc92ddee84697ac4cc10d4d336 e7e48ba66cb597621a30945da9ca7fc36a6dc84c
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/rpc-tests/test_framework/authproxy.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/qa/rpc-tests/test_framework/authproxy.py b/qa/rpc-tests/test_framework/authproxy.py index fba469a0dd..1eb2772592 100644 --- a/qa/rpc-tests/test_framework/authproxy.py +++ b/qa/rpc-tests/test_framework/authproxy.py @@ -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('__'): |