lint: various black formatting updates

Due to upstream changes with a recent release.

Author: radhermit

benches/atom_memory_usage.py

@@ -27,7 +27,7 @@ def test(atoms):
     eprint("---------------------------------------")
     eprint("{:<20} {:<10} time".format("implementation", "memory"))
     eprint("---------------------------------------")
-    for (impl, func) in atom_funcs:
+    for impl, func in atom_funcs:
         if _pid := os.fork():
             os.wait()
         else:

examples/eapi-usage

@@ -39,7 +39,7 @@ def main():
         eapis[pkg.eapi].append(pkg.cpv)
 
     # output EAPI usage in descending order
-    for (eapi, cpvs) in sorted(eapis.items(), key=lambda x: len(x[1]), reverse=True):
+    for eapi, cpvs in sorted(eapis.items(), key=lambda x: len(x[1]), reverse=True):
         print(f"EAPI {eapi}: {len(cpvs)} pkgs")
 
 

examples/revdeps

@@ -41,7 +41,7 @@ def main():
 
     dep_keys = sorted(EAPI_LATEST.dep_keys)
     for pkg in config.repos.ebuild:
-        for (attr, deps) in ((k, deps) for k in dep_keys if (deps := getattr(pkg, k.lower()))):
+        for attr, deps in ((k, deps) for k in dep_keys if (deps := getattr(pkg, k.lower()))):
             for a in filter(restrict.matches, deps.iter_flatten()):
                 print(f"{pkg}: {attr}: {a}")
 

tests/atom/test_base.py

@@ -119,7 +119,7 @@ def test_matches(self):
 
     def test_valid(self, toml_data):
         atom_attrs = []
-        for (attr, val) in inspect.getmembers(Atom):
+        for attr, val in inspect.getmembers(Atom):
             if inspect.isgetsetdescriptor(val):
                 atom_attrs.append(attr)
 
@@ -187,7 +187,7 @@ def parse(s):
 
         for d in toml_data["atom.toml"]["intersects"]:
             # test intersections between all pairs of distinct values
-            for (s1, s2) in itertools.permutations(d["vals"], 2):
+            for s1, s2 in itertools.permutations(d["vals"], 2):
                 (v1, v2) = (parse(s1), parse(s2))
 
                 # elements intersect themselves

tests/atom/test_version.py

@@ -57,7 +57,7 @@ def parse(s):
 
         for d in toml_data["version.toml"]["intersects"]:
             # test intersections between all pairs of distinct values
-            for (s1, s2) in itertools.permutations(d["vals"], 2):
+            for s1, s2 in itertools.permutations(d["vals"], 2):
                 (v1, v2) = (parse(s1), parse(s2))
 
                 # elements intersect themselves

tests/repo/base.py

@@ -44,7 +44,7 @@ def test_pkg_methods_base(self, repo):
         assert repo.packages("cat2") == ("pkga",)
 
     def test_cmp_base(self, make_repo):
-        for (r1_args, op, r2_args) in (
+        for r1_args, op, r2_args in (
             (["a"], "<", ["b"]),
             (["a", 2], "<=", ["b", 1]),
             (["a"], "!=", ["b"]),

tests/repo/test_set.py

@@ -67,7 +67,7 @@ def test_pkg_methods(self, make_fake_repo):
         assert s.versions("a", "b") == ("1",)
 
     def test_cmp(self, make_fake_repo):
-        for (r1, op, r2) in (
+        for r1, op, r2 in (
             ({"id": "a"}, "<", {"id": "b"}),
             ({"id": "a", "priority": 2}, "<=", {"id": "b", "priority": 1}),
             ({"id": "a"}, "!=", {"id": "b"}),
@@ -252,8 +252,8 @@ def test_set_ops(self, make_fake_repo):
         assert (s & RepoSet(r1, r2)).repos == [r2, r1]
         assert (s & r3).repos == [r3]
         assert (r3 & s).repos == [r3]
-        for (a, b) in [(None, s), ("s", s)]:
-            for (x, y) in [(a, b), (b, a)]:
+        for a, b in [(None, s), ("s", s)]:
+            for x, y in [(a, b), (b, a)]:
                 with pytest.raises(TypeError):
                     _ = x & y
 
@@ -262,8 +262,8 @@ def test_set_ops(self, make_fake_repo):
         assert (s | RepoSet(r2, r3)).repos == [r3, r2, r1]
         assert (s | r2).repos == [r2, r1]
         assert (r2 | s).repos == [r2, r1]
-        for (a, b) in [(None, s), ("s", s)]:
-            for (x, y) in [(a, b), (b, a)]:
+        for a, b in [(None, s), ("s", s)]:
+            for x, y in [(a, b), (b, a)]:
                 with pytest.raises(TypeError):
                     _ = x | y
 
@@ -272,8 +272,8 @@ def test_set_ops(self, make_fake_repo):
         assert (s ^ RepoSet(r2, r3)).repos == [r1]
         assert (s ^ r3).repos == [r2, r1]
         assert (r3 ^ s).repos == [r2, r1]
-        for (a, b) in [(None, s), ("s", s)]:
-            for (x, y) in [(a, b), (b, a)]:
+        for a, b in [(None, s), ("s", s)]:
+            for x, y in [(a, b), (b, a)]:
                 with pytest.raises(TypeError):
                     _ = x ^ y
 
@@ -282,7 +282,7 @@ def test_set_ops(self, make_fake_repo):
         assert (s - RepoSet(r1, r2)).repos == []
         assert (s - r3).repos == [r2, r1]
         assert (s - r2).repos == [r1]
-        for (a, b) in [(None, s), ("s", s)]:
-            for (x, y) in [(a, b), (b, a)]:
+        for a, b in [(None, s), ("s", s)]:
+            for x, y in [(a, b), (b, a)]:
                 with pytest.raises(TypeError):
                     _ = x - y

tests/set/test_ordered.py

@@ -206,7 +206,7 @@ def test_difference_and_update(self):
         assert not oset1
 
         # non-iterable objects raise TypeError
-        for (o1, o2) in ((oset1, object()), (object(), oset1)):
+        for o1, o2 in ((oset1, object()), (object(), oset1)):
             with pytest.raises(TypeError):
                 o1 - o2
 
@@ -231,7 +231,7 @@ def test_intersection_and_update(self):
         assert oset1 == oset1
 
         # non-iterable objects raise TypeError
-        for (o1, o2) in ((oset1, object()), (object(), oset1)):
+        for o1, o2 in ((oset1, object()), (object(), oset1)):
             with pytest.raises(TypeError):
                 o1 & o2
 
@@ -322,7 +322,7 @@ def test_symmetric_difference_update(self):
         assert not oset1
 
         # non-iterable objects raise TypeError
-        for (o1, o2) in ((oset1, object()), (object(), oset1)):
+        for o1, o2 in ((oset1, object()), (object(), oset1)):
             with pytest.raises(TypeError):
                 o1 ^ o2
 
@@ -351,7 +351,7 @@ def test_union_and_update(self, lst):
         assert oset1 == oset2 | "abc"
 
         # non-iterable objects raise TypeError
-        for (o1, o2) in ((oset1, object()), (object(), oset1)):
+        for o1, o2 in ((oset1, object()), (object(), oset1)):
             with pytest.raises(TypeError):
                 o1 | o2
 

tests/test_depset.py

@@ -9,7 +9,7 @@ def test_attrs(self, ebuild_repo):
 
     def test_eq_and_hash(self, ebuild_repo):
         # ordering that doesn't matter for equivalence and hashing
-        for (dep, rdep) in (
+        for dep, rdep in (
             # same deps
             ("a/dep", "a/dep"),
             ("use? ( a/dep )", "use? ( a/dep )"),
@@ -23,7 +23,7 @@ def test_eq_and_hash(self, ebuild_repo):
             assert len({pkg.depend, pkg.rdepend}) == 1
 
         # ordering that matters for equivalence and hashing
-        for (dep, rdep) in (("|| ( a/b c/d )", "|| ( c/d a/b )"),):
+        for dep, rdep in (("|| ( a/b c/d )", "|| ( c/d a/b )"),):
             pkg = ebuild_repo.create_pkg("cat/pkg-1", depend=dep, rdepend=rdep)
             assert pkg.depend != pkg.rdepend, f"{dep} != {rdep}"
             assert len({pkg.depend, pkg.rdepend}) == 2
@@ -46,7 +46,7 @@ def test_attrs(self, ebuild_repo):
         assert repr(d).startswith("<DepRestrict 'a/b' at 0x")
 
     def test_cmp(self, ebuild_repo):
-        for (dep, op, rdep) in (
+        for dep, op, rdep in (
             ("a/b", "<", "b/a"),
             ("a/b", "<=", "b/a"),
             ("b/a", "<=", "b/a"),
@@ -62,7 +62,7 @@ def test_cmp(self, ebuild_repo):
 
     def test_eq_and_hash(self, ebuild_repo):
         # ordering that doesn't matter for equivalence and hashing
-        for (dep, rdep) in (
+        for dep, rdep in (
             # same deps
             ("a/dep", "a/dep"),
             ("use? ( a/dep )", "use? ( a/dep )"),
@@ -76,7 +76,7 @@ def test_eq_and_hash(self, ebuild_repo):
             assert len({d1, d2}) == 1
 
         # ordering that matters for equivalence and hashing
-        for (dep, rdep) in (("|| ( a/b c/d )", "|| ( c/d a/b )"),):
+        for dep, rdep in (("|| ( a/b c/d )", "|| ( c/d a/b )"),):
             pkg = ebuild_repo.create_pkg("cat/pkg-1", depend=dep, rdepend=rdep)
             d1, d2 = next(iter(pkg.depend)), next(iter(pkg.rdepend))
             assert d1 != d2

tests/test_eapi.py

@@ -8,7 +8,7 @@
 def test_globals():
     assert len(EAPIS) > len(EAPIS_OFFICIAL)
     # verify objects are shared between EAPIS_OFFICIAL and EAPIS
-    for (id, eapi) in EAPIS_OFFICIAL.items():
+    for id, eapi in EAPIS_OFFICIAL.items():
         assert EAPIS[id] is eapi
     assert EAPIS[str(EAPI_LATEST)] is EAPI_LATEST