Merge branch 'py2n3'0.6.0

* python 3 compatibility
* all tests work in py2.6, 2.7, 3.3, 3.4

1 files changed, 6 insertions, 6 deletions

diff --git a/gitdb/exc.py b/gitdb/exc.py
index 7180fb5..73f84d2 100644
--- a/gitdb/exc.py
+++ b/gitdb/exc.py
@@ -3,21 +3,21 @@
 # This module is part of GitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 """Module with common exceptions"""
-from util import to_hex_sha
+from gitdb.util import to_hex_sha
 
 class ODBError(Exception):
     """All errors thrown by the object database"""
-    
+
 class InvalidDBRoot(ODBError):
     """Thrown if an object database cannot be initialized at the given path"""
-    
+
 class BadObject(ODBError):
-    """The object with the given SHA does not exist. Instantiate with the 
+    """The object with the given SHA does not exist. Instantiate with the
     failed sha"""
-    
+
     def __str__(self):
         return "BadObject: %s" % to_hex_sha(self.args[0])
-        
+
 class ParseError(ODBError):
     """Thrown if the parsing of a file failed due to an invalid format"""