summaryrefslogtreecommitdiff
path: root/awsauth.py
diff options
context:
space:
mode:
authorPaul Tax <paultax@gmail.com>2013-09-27 11:32:56 -0700
committerPaul Tax <paultax@gmail.com>2013-09-27 11:32:56 -0700
commitb4ab2349b63d92d08ef799a700ba568f233d491d (patch)
tree9685356b2f8ee793ac22aac15082834f967a9051 /awsauth.py
parentd6e637cfeb6df8d1fc3e40d4d40fe815d9f9fabe (diff)
parenta39059030d511eddb70500bc9fa01df3d38f2905 (diff)
downloadpython-requests-aws-b4ab2349b63d92d08ef799a700ba568f233d491d.tar.gz
Merge pull request #6 from matheuspatury/master
fix issues to work in Python 3.3.2
Diffstat (limited to 'awsauth.py')
-rw-r--r--awsauth.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/awsauth.py b/awsauth.py
index 9b4f1c4..85cb2a4 100644
--- a/awsauth.py
+++ b/awsauth.py
@@ -6,9 +6,13 @@ from hashlib import sha1 as sha
py3k = False
try:
from urlparse import urlparse
+ from base64 import encodestring
+
except:
py3k = True
from urllib.parse import urlparse
+ from base64 import encodebytes as encodestring
+
from email.utils import formatdate
from requests.auth import AuthBase
@@ -57,7 +61,7 @@ class S3Auth(AuthBase):
key = self.secret_key
msg = canonical_string
h = hmac.new(key, msg, digestmod=sha)
- return base64.encodestring(h.digest()).strip()
+ return encodestring(h.digest()).strip()
def get_canonical_string(self, url, headers, method):
parsedurl = urlparse(url)