Skip to content
Snippets Groups Projects
Unverified Commit ebf27189 authored by Georg Krause's avatar Georg Krause
Browse files

Remove python2 compatibility code

parent 0d89ee66
Branches
Tags
No related merge requests found
from __future__ import absolute_import, division, print_function, unicode_literals
import base64, hashlib, hmac, time import base64, hashlib, hmac, time
import email.utils import email.utils
import requests import requests
from requests.compat import urlparse from urllib.parse import urlparse
from requests.exceptions import RequestException from requests.exceptions import RequestException
class RequestsHttpSignatureException(RequestException): class RequestsHttpMessageSignaturesException(RequestException):
"""An error occurred while constructing the HTTP Signature for your request.""" """An error occurred while constructing the HTTP Signature for your request."""
...@@ -103,7 +101,7 @@ class HTTPSignatureAuth(requests.auth.AuthBase): ...@@ -103,7 +101,7 @@ class HTTPSignatureAuth(requests.auth.AuthBase):
def add_digest(self, request): def add_digest(self, request):
if request.body is None and "digest" in self.headers: if request.body is None and "digest" in self.headers:
raise RequestsHttpSignatureException( raise RequestsHttpMessageSignaturesException(
"Could not compute digest header for request without a body" "Could not compute digest header for request without a body"
) )
if request.body is not None and "Digest" not in request.headers: if request.body is not None and "Digest" not in request.headers:
...@@ -202,7 +200,7 @@ class HTTPSignatureAuth(requests.auth.AuthBase): ...@@ -202,7 +200,7 @@ class HTTPSignatureAuth(requests.auth.AuthBase):
elif scheme == "Signature": elif scheme == "Signature":
assert "Signature" in request.headers, "No Signature header found" assert "Signature" in request.headers, "No Signature header found"
else: else:
raise RequestsHttpSignatureException( raise RequestsHttpMessageSignaturesException(
'Unknown signature scheme "{}"'.format(scheme) 'Unknown signature scheme "{}"'.format(scheme)
) )
......
...@@ -13,10 +13,10 @@ sys.path.insert( ...@@ -13,10 +13,10 @@ sys.path.insert(
0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")) 0, os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
) # noqa ) # noqa
from requests_http_signature import ( from requests_http_message_signatures import (
HTTPSignatureAuth, HTTPSignatureAuth,
HTTPSignatureHeaderAuth, HTTPSignatureHeaderAuth,
RequestsHttpSignatureException, RequestsHttpMessageSignaturesException,
) )
hmac_secret = b"monorail_cat" hmac_secret = b"monorail_cat"
...@@ -77,7 +77,7 @@ class TestRequestsHTTPSignature(unittest.TestCase): ...@@ -77,7 +77,7 @@ class TestRequestsHTTPSignature(unittest.TestCase):
url, auth=HTTPSignatureAuth(key=hmac_secret[::-1], key_id="sekret") url, auth=HTTPSignatureAuth(key=hmac_secret[::-1], key_id="sekret")
) )
with self.assertRaisesRegex( with self.assertRaisesRegex(
RequestsHttpSignatureException, RequestsHttpMessageSignaturesException,
"Could not compute digest header for request without a body", "Could not compute digest header for request without a body",
): ):
self.session.get( self.session.get(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment