aboutsummaryrefslogtreecommitdiff
path: root/git/objects
diff options
context:
space:
mode:
Diffstat (limited to 'git/objects')
-rw-r--r--git/objects/submodule/base.py3
-rw-r--r--git/objects/tree.py3
2 files changed, 2 insertions, 4 deletions
diff --git a/git/objects/submodule/base.py b/git/objects/submodule/base.py
index 04ca0221..97973a57 100644
--- a/git/objects/submodule/base.py
+++ b/git/objects/submodule/base.py
@@ -9,7 +9,6 @@ import uuid
import git
from git.cmd import Git
from git.compat import (
- string_types,
defenc,
is_win,
)
@@ -110,7 +109,7 @@ class Submodule(IndexObject, Iterable, Traversable):
if url is not None:
self._url = url
if branch_path is not None:
- assert isinstance(branch_path, string_types)
+ assert isinstance(branch_path, str)
self._branch_path = branch_path
if name is not None:
self._name = name
diff --git a/git/objects/tree.py b/git/objects/tree.py
index 90996bfa..469e5395 100644
--- a/git/objects/tree.py
+++ b/git/objects/tree.py
@@ -11,7 +11,6 @@ from . import util
from .base import IndexObject
from .blob import Blob
from .submodule.base import Submodule
-from git.compat import string_types
from .fun import (
tree_entries_from_data,
@@ -290,7 +289,7 @@ class Tree(IndexObject, diff.Diffable, util.Traversable, util.Serializable):
info = self._cache[item]
return self._map_id_to_type[info[1] >> 12](self.repo, info[0], info[1], join_path(self.path, info[2]))
- if isinstance(item, string_types):
+ if isinstance(item, str):
# compatibility
return self.join(item)
# END index is basestring