diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-03-28 13:22:06 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-03-28 13:26:04 +0200 |
| commit | 84370d58ffc6d5ea22efa0e579dea00f860ad369 (patch) | |
| tree | 6e7de0660f14fae697600246a46b398efb63d33e | |
| parent | 0b98dd7939674b61c28252d14b3fbd0f51d3912b (diff) | |
| parent | e7e48ba66cb597621a30945da9ca7fc36a6dc84c (diff) | |
Merge #7751: test_framework: python3.4 authproxy compat
e7e48ba test_framework: Py3.4 compat: Specify timeout parameter by name (Luke Dashjr)
d7b80b5 test_framework: Avoid infinite loop in encoding Decimal (Wladimir J. van der Laan)
| -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('__'): |