Unnecessary generator - rewrite as a set comprehension

hugovk · hugovk · commit db0dfa07e34e · 2018-03-18T22:26:31.000+02:00
diff --git a/git/test/test_fun.py b/git/test/test_fun.py
@@ -211,7 +211,7 @@ def assert_entries(entries, num_entries, has_conflict=False):
     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
diff --git a/git/test/test_index.py b/git/test/test_index.py
@@ -147,8 +147,8 @@ def _cmp_tree_index(self, tree, index):
             blist.append(blob)
         # END for each blob in tree
         if len(blist) != len(index.entries):
-            iset = set(k[0] for k in index.entries.keys())
-            bset = set(b.path for b in blist)
+            iset = {k[0] for k in index.entries.keys()}
+            bset = {b.path for b in blist}
             raise AssertionError("CMP Failed: Missing entries in index: %s, missing in tree: %s" %
                                  (bset - iset, iset - bset))
         # END assertion message
diff --git a/git/test/test_tree.py b/git/test/test_tree.py
@@ -88,7 +88,7 @@ def test_traverse(self):
 
         # 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)
