summaryrefslogtreecommitdiff
path: root/git/test/test_fun.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2018-03-24 13:45:17 +0100
committerGitHub <noreply@github.com>2018-03-24 13:45:17 +0100
commitf3265bd8beb017890699d093586126ff8af4a3fe (patch)
treeccf02df66dbb979c7f6da6949456902a06aa1b1e /git/test/test_fun.py
parent9f12b26b81a8e7667b2a26a7878e5bc033610ed5 (diff)
parent80b038f8d8c7c67c148ebd7a5f7a0cb39541b761 (diff)
downloadgitpython-f3265bd8beb017890699d093586126ff8af4a3fe.tar.gz
Merge pull request #737 from hugovk/rm-2.6
Drop support for EOL Python 2.6 and 3.3
Diffstat (limited to 'git/test/test_fun.py')
-rw-r--r--git/test/test_fun.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/git/test/test_fun.py b/git/test/test_fun.py
index 5e32a1f9..314fb734 100644
--- a/git/test/test_fun.py
+++ b/git/test/test_fun.py
@@ -2,11 +2,7 @@ from io import BytesIO
from stat import S_IFDIR, S_IFREG, S_IFLNK
from os import stat
import os.path as osp
-
-try:
- from unittest import skipIf, SkipTest
-except ImportError:
- from unittest2 import skipIf, SkipTest
+from unittest import skipIf, SkipTest
from git import Git
from git.compat import PY3
@@ -215,7 +211,7 @@ class TestFun(TestBase):
def _assert_tree_entries(self, entries, num_trees):
for entry in entries:
assert len(entry) == num_trees
- paths = set(e[2] for e in entry if e)
+ paths = {e[2] for e in entry if e}
# only one path per set of entries
assert len(paths) == 1