Use encode_string for key and data - fix for py26 unicode_literals

Author: radeklos

CHANGELOG.rst

@@ -1,6 +1,10 @@
 Change Log
 ----------
 
+1.3.2
+~~~~~
+- Fix - unicode key
+
 1.3.1
 ~~~~~
 - Get rid of brackets in decorator

VERSION.txt

@@ -1 +1 @@
-1.3.1
+1.3.2

djangohmac/sign.py

@@ -71,7 +71,11 @@ def get_signature(self, request):
 
     def _hmac_factory(self, data, key=None, digestmod=None):
         key = six.b(key) if key else self.hmac_key
-        return hmac.new(key, data, digestmod=self.digestmod)
+        return hmac.new(
+            encode_string(key),
+            encode_string(data),
+            digestmod=self.digestmod
+        )
 
     def make_hmac(self, data='', key=None):
         """ Generates HMAC key
@@ -80,7 +84,7 @@ def make_hmac(self, data='', key=None):
             data (str): HMAC message
             key (str): secret key of another app
         """
-        hmac_token_server = self._hmac_factory(encode_string(data), key).digest()
+        hmac_token_server = self._hmac_factory(data, key).digest()
         hmac_token_server = base64.b64encode(hmac_token_server)
         return hmac_token_server
 

tests/test_hmac.py

@@ -55,3 +55,8 @@ def test_valid_signature_for_resticted_view(self):
                 request,
                 only=['serviceA']
             )
+
+    def test_generate_signature_for_unicode_key(self):
+        uncode = self.hmac._hmac_factory('', key=u'unicode').digest()
+        sr = self.hmac._hmac_factory('', key='unicode').digest()
+        assert sr == uncode