diff --git a/requests_http_message_signatures/__init__.py b/requests_http_message_signatures/__init__.py index 767c9aa12bfaf964d85185388bf16411fa59d655..b1f681fee0a73788a55e08f1198f0665d5dc51d4 100644 --- a/requests_http_message_signatures/__init__.py +++ b/requests_http_message_signatures/__init__.py @@ -1,14 +1,12 @@ -from __future__ import absolute_import, division, print_function, unicode_literals - import base64, hashlib, hmac, time import email.utils import requests -from requests.compat import urlparse +from urllib.parse import urlparse from requests.exceptions import RequestException -class RequestsHttpSignatureException(RequestException): +class RequestsHttpMessageSignaturesException(RequestException): """An error occurred while constructing the HTTP Signature for your request.""" @@ -103,7 +101,7 @@ class HTTPSignatureAuth(requests.auth.AuthBase): def add_digest(self, request): if request.body is None and "digest" in self.headers: - raise RequestsHttpSignatureException( + raise RequestsHttpMessageSignaturesException( "Could not compute digest header for request without a body" ) if request.body is not None and "Digest" not in request.headers: @@ -202,7 +200,7 @@ class HTTPSignatureAuth(requests.auth.AuthBase): elif scheme == "Signature": assert "Signature" in request.headers, "No Signature header found" else: - raise RequestsHttpSignatureException( + raise RequestsHttpMessageSignaturesException( 'Unknown signature scheme "{}"'.format(scheme) ) diff --git a/test/test.py b/test/test.py index 04d9f1300c7bfab978332a8b1b6d8299110b0f75..7f2bf7851b0e769f298d59a04b39dd6c5f01a278 100755 --- a/test/test.py +++ b/test/test.py @@ -13,10 +13,10 @@ sys.path.insert( 0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")) ) # noqa -from requests_http_signature import ( +from requests_http_message_signatures import ( HTTPSignatureAuth, HTTPSignatureHeaderAuth, - RequestsHttpSignatureException, + RequestsHttpMessageSignaturesException, ) hmac_secret = b"monorail_cat" @@ -77,7 +77,7 @@ class TestRequestsHTTPSignature(unittest.TestCase): url, auth=HTTPSignatureAuth(key=hmac_secret[::-1], key_id="sekret") ) with self.assertRaisesRegex( - RequestsHttpSignatureException, + RequestsHttpMessageSignaturesException, "Could not compute digest header for request without a body", ): self.session.get(