Merge branch 'py3' into 0.3

Conflicts:
	git/refs/log.py

1 files changed, 5 insertions, 6 deletions

diff --git a/git/index/typ.py b/git/index/typ.py
index 222252c5..0998ecb0 100644
--- a/git/index/typ.py
+++ b/git/index/typ.py
@@ -1,15 +1,14 @@
 """Module with additional types used by the index"""
 
-from util import (
+from binascii import b2a_hex
+
+from .util import (
     pack,
     unpack
 )
+from git.objects import Blob
 
-from binascii import (
-    b2a_hex,
-)
 
-from git.objects import Blob
 __all__ = ('BlobFilter', 'BaseIndexEntry', 'IndexEntry')
 
 #{ Invariants
@@ -76,7 +75,7 @@ class BaseIndexEntry(tuple):
     @property
     def hexsha(self):
         """hex version of our sha"""
-        return b2a_hex(self[1])
+        return b2a_hex(self[1]).decode('ascii')
 
     @property
     def stage(self):