From 929f3e1e1b664ed8cdef90a40c96804edfd08d59 Mon Sep 17 00:00:00 2001 From: Hugo Date: Sun, 18 Mar 2018 12:06:10 +0200 Subject: Drop support for EOL Python 2.6 --- git/test/test_tree.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'git/test/test_tree.py') diff --git a/git/test/test_tree.py b/git/test/test_tree.py index 5fd4d760..f3376e23 100644 --- a/git/test/test_tree.py +++ b/git/test/test_tree.py @@ -6,10 +6,7 @@ from io import BytesIO import sys -try: - from unittest import skipIf -except ImportError: - from unittest2 import skipIf +from unittest import skipIf from git import ( Tree, -- cgit v1.2.1 From ac4f7d34f8752ab78949efcaa9f0bd938df33622 Mon Sep 17 00:00:00 2001 From: Hugo Date: Sun, 18 Mar 2018 21:33:18 +0200 Subject: Rewrite unnecessary dict/list/tuple calls as literals --- git/test/test_tree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git/test/test_tree.py') diff --git a/git/test/test_tree.py b/git/test/test_tree.py index f3376e23..2b2ddb05 100644 --- a/git/test/test_tree.py +++ b/git/test/test_tree.py @@ -61,7 +61,7 @@ class TestTree(TestBase): def test_traverse(self): root = self.rorepo.tree('0.1.6') num_recursive = 0 - all_items = list() + all_items = [] for obj in root.traverse(): if "/" in obj.path: num_recursive += 1 -- cgit v1.2.1 From 87a644184b05e99a4809de378f21424ef6ced06e Mon Sep 17 00:00:00 2001 From: Hugo Date: Sun, 18 Mar 2018 21:43:41 +0200 Subject: Unnecessary generator - rewrite as a list comprehension --- git/test/test_tree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git/test/test_tree.py') diff --git a/git/test/test_tree.py b/git/test/test_tree.py index 2b2ddb05..3005722f 100644 --- a/git/test/test_tree.py +++ b/git/test/test_tree.py @@ -79,7 +79,7 @@ class TestTree(TestBase): # only choose trees trees_only = lambda i, d: i.type == "tree" trees = list(root.traverse(predicate=trees_only)) - assert len(trees) == len(list(i for i in root.traverse() if trees_only(i, 0))) + assert len(trees) == len([i for i in root.traverse() if trees_only(i, 0)]) # test prune lib_folder = lambda t, d: t.path == "lib" -- cgit v1.2.1 From db0dfa07e34ed80bfe0ce389da946755ada13c5d Mon Sep 17 00:00:00 2001 From: Hugo Date: Sun, 18 Mar 2018 21:50:16 +0200 Subject: Unnecessary generator - rewrite as a set comprehension --- git/test/test_tree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git/test/test_tree.py') diff --git a/git/test/test_tree.py b/git/test/test_tree.py index 3005722f..dc23f29c 100644 --- a/git/test/test_tree.py +++ b/git/test/test_tree.py @@ -88,7 +88,7 @@ class TestTree(TestBase): # trees and blobs assert len(set(trees) | set(root.trees)) == len(trees) - assert len(set(b for b in root if isinstance(b, Blob)) | set(root.blobs)) == len(root.blobs) + assert len({b for b in root if isinstance(b, Blob)} | set(root.blobs)) == len(root.blobs) subitem = trees[0][0] assert "/" in subitem.path assert subitem.name == osp.basename(subitem.path) -- cgit v1.2.1