Support Python 3

jacquev6 · Oct 4, 2014 · be7b71c · be7b71c
1 parent a6d165a
commit be7b71c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@
 /LowVoltage.egg-info/
 /dist/
 *.pyc
+/build/
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,7 @@
 language: python
 python:
   - "2.7"
-  # - "3.3"
-  # - "3.4"
+  - "3.4"
 install:
   - pip install -r requirements.txt
   - pip install coveralls

diff --git a/LowVoltage/connection.py b/LowVoltage/connection.py
@@ -86,7 +86,7 @@ def _sign(self, now, operation, payload):
         request = "POST\n/\n\n{}\n{}\n{}".format(
             "".join("{}:{}\n".format(key.lower(), val) for key, val in sorted(headers.iteritems())),
             header_names,
-            hashlib.sha256(payload).hexdigest(),
+            hashlib.sha256(payload.encode("utf-8")).hexdigest(),
         )
         credentials = "{}/{}/dynamodb/aws4_request".format(
             datestamp,
@@ -95,7 +95,7 @@ def _sign(self, now, operation, payload):
         to_sign = "AWS4-HMAC-SHA256\n{}\n{}\n{}".format(
             timestamp,
             credentials,
-            hashlib.sha256(request).hexdigest(),
+            hashlib.sha256(request.encode("utf-8")).hexdigest(),
         )
 
         aws_key, aws_secret = self.__credentials.get()
@@ -104,25 +104,25 @@ def _sign(self, now, operation, payload):
             hmac.new(
                 hmac.new(
                     hmac.new(
-                        "AWS4{}".format(aws_secret),
-                        datestamp,
+                        "AWS4{}".format(aws_secret).encode("utf-8"),
+                        datestamp.encode("utf-8"),
                         hashlib.sha256
                     ).digest(),
-                    self.__region,
+                    self.__region.encode("utf-8"),
                     hashlib.sha256
                 ).digest(),
-                "dynamodb",
+                "dynamodb".encode("utf-8"),
                 hashlib.sha256
             ).digest(),
-            "aws4_request",
+            "aws4_request".encode("utf-8"),
             hashlib.sha256
         ).digest()
 
         headers["Authorization"] = "AWS4-HMAC-SHA256 Credential={}/{}, SignedHeaders={}, Signature={}".format(
             aws_key,
             credentials,
             header_names,
-            hmac.new(key, to_sign, hashlib.sha256).hexdigest(),
+            hmac.new(key, to_sign.encode("utf-8"), hashlib.sha256).hexdigest(),
         )
 
         return headers, payload

diff --git a/README.rst b/README.rst
@@ -1,4 +1,4 @@
-LowVoltage is a Python client for DynamoDB that doesn't hide any feature of the API.
+LowVoltage is a Python (2 and 3) client for DynamoDB that doesn't hide any feature of the API.
 
 .. image:: https://travis-ci.org/jacquev6/LowVoltage.svg?branch=master
     :target: https://travis-ci.org/jacquev6/LowVoltage

diff --git a/setup.py b/setup.py
@@ -27,9 +27,8 @@
             "Programming Language :: Python",
             "Programming Language :: Python :: 2",
             "Programming Language :: Python :: 2.7",
-            # "Programming Language :: Python :: 3",
-            # "Programming Language :: Python :: 3.3",
-            # "Programming Language :: Python :: 3.4",
+            "Programming Language :: Python :: 3",
+            "Programming Language :: Python :: 3.4",
             "Environment :: Web Environment",
         ],
         test_suite="LowVoltage.tests",