diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2015-01-04 19:50:28 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2015-01-04 19:50:28 +0100 |
| commit | ae2ff0f9d704dc776a1934f72a339da206a9fff4 (patch) | |
| tree | 53b7cb30f47c60bdf38d824f1c729191d1f1f2d9 /git/test/test_submodule.py | |
| parent | f6aa8d116eb33293c0a9d6d600eb7c32832758b9 (diff) | |
| download | gitpython-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_submodule.py')
| -rw-r--r-- | git/test/test_submodule.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git/test/test_submodule.py b/git/test/test_submodule.py index ec3459e4..8c1580fe 100644 --- a/git/test/test_submodule.py +++ b/git/test/test_submodule.py @@ -9,6 +9,7 @@ from git.exc import InvalidGitRepositoryError from git.objects.submodule.base import Submodule from git.objects.submodule.root import RootModule, RootUpdateProgress from git.util import to_native_path_linux, join_path_native +from git.compat import string_types import shutil import git import sys @@ -76,7 +77,7 @@ class TestSubmodule(TestBase): self.failUnlessRaises(InvalidGitRepositoryError, getattr, sm, 'branch') # branch_path works, as its just a string - assert isinstance(sm.branch_path, basestring) + assert isinstance(sm.branch_path, string_types) # some commits earlier we still have a submodule, but its at a different commit smold = Submodule.iter_items(rwrepo, self.k_subm_changed).next() |