summaryrefslogtreecommitdiff
path: root/git/test/test_index.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2015-01-04 19:50:28 +0100
committerSebastian Thiel <byronimo@gmail.com>2015-01-04 19:50:28 +0100
commitae2ff0f9d704dc776a1934f72a339da206a9fff4 (patch)
tree53b7cb30f47c60bdf38d824f1c729191d1f1f2d9 /git/test/test_index.py
parentf6aa8d116eb33293c0a9d6d600eb7c32832758b9 (diff)
downloadgitpython-ae2ff0f9d704dc776a1934f72a339da206a9fff4.tar.gz
Dum brute force conversion of all types.
However, StringIO really is ByteIO in most cases, and py2.7 should run but doesn't. This should be made work first.
Diffstat (limited to 'git/test/test_index.py')
-rw-r--r--git/test/test_index.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/git/test/test_index.py b/git/test/test_index.py
index 74bdac53..70d70a05 100644
--- a/git/test/test_index.py
+++ b/git/test/test_index.py
@@ -20,6 +20,7 @@ from git import (
GitCommandError,
CheckoutError,
)
+from git.compat import string_types
from gitdb.util import hex_to_bin
import os
import sys
@@ -343,7 +344,7 @@ class TestIndex(TestBase):
index.checkout(test_file)
except CheckoutError as e:
assert len(e.failed_files) == 1 and e.failed_files[0] == os.path.basename(test_file)
- assert (len(e.failed_files) == len(e.failed_reasons)) and isinstance(e.failed_reasons[0], basestring)
+ assert (len(e.failed_files) == len(e.failed_reasons)) and isinstance(e.failed_reasons[0], string_types)
assert len(e.valid_files) == 0
assert open(test_file).read().endswith(append_data)
else: