diff options
Diffstat (limited to 'git/objects/submodule')
| -rw-r--r-- | git/objects/submodule/base.py | 9 | ||||
| -rw-r--r-- | git/objects/submodule/root.py | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/git/objects/submodule/base.py b/git/objects/submodule/base.py index 33151217..f37da34a 100644 --- a/git/objects/submodule/base.py +++ b/git/objects/submodule/base.py @@ -3,10 +3,7 @@ from io import BytesIO import logging import os import stat -try: - from unittest import SkipTest -except ImportError: - from unittest2 import SkipTest +from unittest import SkipTest import uuid import git @@ -63,7 +60,7 @@ class UpdateProgress(RemoteProgress): CLONE, FETCH, UPDWKTREE = [1 << x for x in range(RemoteProgress._num_op_codes, RemoteProgress._num_op_codes + 3)] _num_op_codes = RemoteProgress._num_op_codes + 3 - __slots__ = tuple() + __slots__ = () BEGIN = UpdateProgress.BEGIN @@ -142,7 +139,7 @@ class Submodule(IndexObject, Iterable, Traversable): try: return type(self).list_items(item.module()) except InvalidGitRepositoryError: - return list() + return [] # END handle intermediate items @classmethod diff --git a/git/objects/submodule/root.py b/git/objects/submodule/root.py index fbd658d7..f2035e5b 100644 --- a/git/objects/submodule/root.py +++ b/git/objects/submodule/root.py @@ -22,7 +22,7 @@ class RootUpdateProgress(UpdateProgress): 1 << x for x in range(UpdateProgress._num_op_codes, UpdateProgress._num_op_codes + 4)] _num_op_codes = UpdateProgress._num_op_codes + 4 - __slots__ = tuple() + __slots__ = () BEGIN = RootUpdateProgress.BEGIN @@ -38,7 +38,7 @@ class RootModule(Submodule): """A (virtual) Root of all submodules in the given repository. It can be used to more easily traverse all submodules of the master repository""" - __slots__ = tuple() + __slots__ = () k_root_name = '__ROOT__' |