commit 0b2042b6269bae9869a6ecbde586cec8158f4553
author Paul Kehrer <paul.l.kehrer@gmail.com> Tue Oct 22 14:28:24 2013 -0500
committer Paul Kehrer <paul.l.kehrer@gmail.com> Tue Oct 22 14:28:24 2013 -0500
tree 5c0a8acf4cb118332fe3a9f231bdcdae263e08ed
parent 9949702886c815277bb7483b1a0d429a2a7ffd7c

fixes #148 + test case

cryptography/primitives/hashes.py

diff --git a/cryptography/primitives/hashes.py b/cryptography/primitives/hashes.py
index c4bd8ad..7133a91 100644
--- a/cryptography/primitives/hashes.py
+++ b/cryptography/primitives/hashes.py
@@ -44,7 +44,7 @@
                                                self.digest_size)
 
     def hexdigest(self):
-        return binascii.hexlify(self.digest()).decode("ascii")
+        return str(binascii.hexlify(self.digest()).decode("ascii"))
 
     def _copy_ctx(self):
         return self._api.copy_hash_context(self._ctx)

tests/primitives/test_hashes.py

diff --git a/tests/primitives/test_hashes.py b/tests/primitives/test_hashes.py
index 805d992..03de891 100644
--- a/tests/primitives/test_hashes.py
+++ b/tests/primitives/test_hashes.py
@@ -28,6 +28,10 @@
         with pytest.raises(TypeError):
             m.update(six.u("\u00FC"))
 
+    def test_base_hash_hexdigest_string_type(self, api):
+        m = hashes.SHA1(api=api, data=b"")
+        assert isinstance(m.hexdigest(), str)
+
 
 class TestSHA1(object):
     test_SHA1 = generate_base_hash_test(