From 83e3f2a12a8276975748a6f7a48a9258469140f7 Mon Sep 17 00:00:00 2001 From: /dev/null Date: Wed, 1 Dec 2021 18:09:10 +0000 Subject: [PATCH] Re-use requests.auth.HTTPDigestAuth between requests Fixes: #104 --- .travis.yml | 1 + README.rst | 6 ++++++ monero/backends/jsonrpc/daemon.py | 9 +++------ monero/backends/jsonrpc/wallet.py | 6 ++---- test_requirements_py3.txt | 1 + 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8db2237..d8f9566 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ install: - pip install dist/*.tar.gz # install dependencies as specified in setup.py - pip install -r test_requirements_py`echo $TRAVIS_PYTHON_VERSION | cut -f 1 -d .`.txt script: + - black --check . - pytest after_success: - coveralls diff --git a/README.rst b/README.rst index 395c895..a56afd7 100644 --- a/README.rst +++ b/README.rst @@ -91,3 +91,9 @@ Development .. code-block:: bash .venv/bin/pytest + +6. Format your code with black + +.. code-block:: bash + + .venv/bin/black . diff --git a/monero/backends/jsonrpc/daemon.py b/monero/backends/jsonrpc/daemon.py index 00b7195..8cebe47 100755 --- a/monero/backends/jsonrpc/daemon.py +++ b/monero/backends/jsonrpc/daemon.py @@ -106,8 +106,7 @@ class JSONRPCDaemon(object): protocol=protocol, host=host, port=port ) _log.debug("JSONRPC daemon backend URL: {url}".format(url=self.url)) - self.user = user - self.password = password + self.auth = requests.auth.HTTPDigestAuth(user, password) self.timeout = timeout self.verify_ssl_certs = verify_ssl_certs self.proxies = {protocol: proxy_url} @@ -222,12 +221,11 @@ class JSONRPCDaemon(object): path=path, data=json.dumps(data, indent=2, sort_keys=True) ) ) - auth = requests.auth.HTTPDigestAuth(self.user, self.password) rsp = requests.post( self.url + path, headers=hdr, data=json.dumps(data) if data else None, - auth=auth, + auth=self.auth, timeout=self.timeout, verify=self.verify_ssl_certs, proxies=self.proxies, @@ -251,12 +249,11 @@ class JSONRPCDaemon(object): method=method, params=json.dumps(params, indent=2, sort_keys=True) ) ) - auth = requests.auth.HTTPDigestAuth(self.user, self.password) rsp = requests.post( self.url + "/json_rpc", headers=hdr, data=json.dumps(data), - auth=auth, + auth=self.auth, timeout=self.timeout, verify=self.verify_ssl_certs, proxies=self.proxies, diff --git a/monero/backends/jsonrpc/wallet.py b/monero/backends/jsonrpc/wallet.py index 12516e4..4a6d22f 100644 --- a/monero/backends/jsonrpc/wallet.py +++ b/monero/backends/jsonrpc/wallet.py @@ -50,8 +50,7 @@ class JSONRPCWallet(object): protocol=protocol, host=host, port=port ) _log.debug("JSONRPC wallet backend URL: {url}".format(url=self.url)) - self.user = user - self.password = password + self.auth = requests.auth.HTTPDigestAuth(user, password) self.timeout = timeout self.verify_ssl_certs = verify_ssl_certs self.proxies = {protocol: proxy_url} @@ -386,12 +385,11 @@ class JSONRPCWallet(object): method=method, params=json.dumps(params, indent=2, sort_keys=True) ) ) - auth = requests.auth.HTTPDigestAuth(self.user, self.password) rsp = requests.post( self.url, headers=hdr, data=json.dumps(data), - auth=auth, + auth=self.auth, timeout=self.timeout, verify=self.verify_ssl_certs, proxies=self.proxies, diff --git a/test_requirements_py3.txt b/test_requirements_py3.txt index c2e8b47..425b105 100644 --- a/test_requirements_py3.txt +++ b/test_requirements_py3.txt @@ -1,3 +1,4 @@ +black==21.11b1 coverage~=5.3 coveralls~=2.1 pip>=9