Merge branch 'py3' into 0.3

Conflicts:
	git/refs/log.py

1 files changed, 2 insertions, 1 deletions

diff --git a/git/test/test_util.py b/git/test/test_util.py
index 888eb4ee..c6ca6920 100644
--- a/git/test/test_util.py
+++ b/git/test/test_util.py
@@ -24,6 +24,7 @@ from git.objects.util import (
     parse_date,
 )
 from git.cmd import dashify
+from git.compat import string_types
 
 import time
 
@@ -104,7 +105,7 @@ class TestUtils(TestBase):
 
             # now that we are here, test our conversion functions as well
             utctz = altz_to_utctz_str(offset)
-            assert isinstance(utctz, basestring)
+            assert isinstance(utctz, string_types)
             assert utctz_to_altz(verify_utctz(utctz)) == offset
         # END assert rval utility