Python3 support : another take

.travis.yml

@@ -1,6 +1,7 @@
 language: python
 python:
  - "2.7"
+ - "3.4"
 
 # command to install dependencies
 install: pip install -r requirements.txt

README.md

@@ -4,7 +4,7 @@
 
 This package allows you to authenticate to AWS with Amazon's [signature version 4 signing process](https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html) with the python [requests](http://docs.python-requests.org/en/latest/) library.
 
-Developed and tested with python `2.7.10`.
+Tested with both python `2.7` and `3.4`.
 
 # Installation
 

aws_requests_auth/aws_auth.py

@@ -1,8 +1,13 @@
 import hmac
-import urllib
 import hashlib
 import datetime
-from urlparse import urlparse
+try:
+ # python 2
+ from urllib import quote
+ from urlparse import urlparse
+except ImportError:
+ # python 3
+ from urllib.parse import quote, urlparse
 
 import requests
 
@@ -95,7 +100,7 @@ def __call__(self, r):
 
  # Create payload hash (hash of the request body content). For GET
  # requests, the payload is an empty string ('').
- body = r.body if r.body else ''
+ body = r.body if r.body else bytes()
  payload_hash = hashlib.sha256(body).hexdigest()
 
  # Combine elements to create create canonical request
@@ -109,7 +114,7 @@ def __call__(self, r):
  credential_scope = (datestamp + '/' + self.aws_region + '/' +
  self.service +'/' + 'aws4_request')
  string_to_sign = (algorithm + '\n' + amzdate + '\n' + credential_scope +
- '\n' + hashlib.sha256(canonical_request).hexdigest())
+ '\n' + hashlib.sha256(canonical_request.encode('utf-8')).hexdigest())
 
  # Create the signing key using the function defined above.
  signing_key = getSignatureKey(self.aws_secret_access_key,
@@ -146,7 +151,7 @@ def get_caononical_path(cls, r):
 
  # safe chars adapted from boto's use of urllib.parse.quote
  # https://github.com/boto/boto/blob/d9e5cfe900e1a58717e393c76a6e3580305f217a/boto/auth.py#L393
- return urllib.quote(parsedurl.path if parsedurl.path else '/', safe='/-_.~')
+ return quote(parsedurl.path if parsedurl.path else '/', safe='/-_.~')
 
  @classmethod
  def get_canonical_querystring(cls, r):

aws_requests_auth/tests/test_aws_auth.py

@@ -1,3 +1,4 @@
+import datetime
 import mock
 import unittest
 
@@ -65,3 +66,56 @@ def test_post_request_with_get_param(self):
  mock_request.url = url
  mock_request.method = "POST"
  self.assertEqual('version=1', AWSRequestsAuth.get_canonical_querystring(mock_request))
+
+ def test_auth_for_get(self):
+ auth = AWSRequestsAuth(aws_access_key='YOURKEY',
+ aws_secret_access_key='YOURSECRET',
+ aws_host='search-foo.us-east-1.es.amazonaws.com',
+ aws_region='us-east-1',
+ aws_service='es')
+ url = 'http://search-foo.us-east-1.es.amazonaws.com:80/'
+ mock_request = mock.Mock()
+ mock_request.url = url
+ mock_request.method = "GET"
+ mock_request.body = None
+ mock_request.headers = {}
+
+ frozen_datetime = datetime.datetime(2016, 6, 18, 22, 4, 5)
+ with mock.patch('datetime.datetime') as mock_datetime:
+ mock_datetime.utcnow.return_value = frozen_datetime
+ auth(mock_request)
+ self.assertEqual({
+ 'Authorization': 'AWS4-HMAC-SHA256 Credential=YOURKEY/20160618/us-east-1/es/aws4_request, '
+ 'SignedHeaders=host;x-amz-date, '
+ 'Signature=ca0a856286efce2a4bd96a978ca6c8966057e53184776c0685169d08abd74739',
+ 'x-amz-date': '20160618T220405Z',
+
+ }, mock_request.headers)
+
+ def test_auth_for_post(self):
+ auth = AWSRequestsAuth(aws_access_key='YOURKEY',
+ aws_secret_access_key='YOURSECRET',
+ aws_host='search-foo.us-east-1.es.amazonaws.com',
+ aws_region='us-east-1',
+ aws_service='es')
+ url = 'http://search-foo.us-east-1.es.amazonaws.com:80/'
+ mock_request = mock.Mock()
+ mock_request.url = url
+ mock_request.method = "POST"
+ mock_request.body = b'foo=bar'
+ mock_request.headers = {
+ 'Content-Type': 'application/x-www-form-urlencoded',
+ }
+
+ frozen_datetime = datetime.datetime(2016, 6, 18, 22, 4, 5)
+ with mock.patch('datetime.datetime') as mock_datetime:
+ mock_datetime.utcnow.return_value = frozen_datetime
+ auth(mock_request)
+ self.assertEqual({
+ 'Authorization': 'AWS4-HMAC-SHA256 Credential=YOURKEY/20160618/us-east-1/es/aws4_request, '
+ 'SignedHeaders=host;x-amz-date, '
+ 'Signature=a6fd88e5f5c43e005482894001d9b05b43f6710e96be6098bcfcfccdeb8ed812',
+ 'Content-Type': 'application/x-www-form-urlencoded',
+ 'x-amz-date': '20160618T220405Z',
+
+ }, mock_request.headers)