*/*: misc ruff fixes

This is from `ruff check --fix` with ruff-0.16.0 then I checked the whole diff
a few times manually.

Signed-off-by: Sam James <sam@gentoo.org>

Author: thesamesam

pym/gentoolkit/atom.py

@@ -16,9 +16,9 @@
 
 import portage
 
+from gentoolkit import errors
 from gentoolkit.cpv import CPV
 from gentoolkit.versionmatch import VersionMatch
-from gentoolkit import errors
 
 # =======
 # Classes

pym/gentoolkit/cpv.py

@@ -14,7 +14,7 @@
 
 import re
 
-from portage.versions import catpkgsplit, vercmp, pkgcmp
+from portage.versions import catpkgsplit, pkgcmp, vercmp
 
 from gentoolkit import errors
 

pym/gentoolkit/dependencies.py

@@ -12,17 +12,18 @@
 # =======
 
 import itertools
-from functools import cache
+from collections.abc import Iterable, Iterator
 from enum import Enum
-from typing import List, Dict, Iterable, Iterator, Set, Optional, Any, Union
+from functools import cache
+from typing import Any, Dict, List, Optional, Set, Union
 
 import portage
 from portage.dep import paren_reduce
 
 from gentoolkit import errors
 from gentoolkit.atom import Atom
-from gentoolkit.query import Query
 from gentoolkit.cpv import CPV
+from gentoolkit.query import Query
 
 # =======
 # Classes
@@ -161,9 +162,7 @@ def graph_depends(
             except KeyError:
                 pkgdep = Query(dep.atom).find_best()
                 depcache[dep.atom] = pkgdep
-            if not pkgdep:
-                continue
-            elif pkgdep.cpv in seen:
+            if not pkgdep or pkgdep.cpv in seen:
                 continue
             if depth <= max_depth or max_depth == 0:
                 if printer_fn is not None:

pym/gentoolkit/eclean/clean.py

@@ -8,10 +8,11 @@
 import shutil
 import sys
 
-import gentoolkit.pprinter as pp
 from portage.emaint.main import TaskHandler
 from portage.emaint.modules.binhost import binhost
 
+import gentoolkit.pprinter as pp
+
 
 class CleanUp:
     """Performs all cleaning actions to distfiles or package directories.

pym/gentoolkit/eclean/cli.py

@@ -688,11 +688,9 @@ def doAction(action, options, exclude={}, output=None):
             if not options["quiet"]:
                 print()
                 print(
-                    (
-                        pp.emph("   The following ")
-                        + red("invalid")
-                        + pp.emph(" binpkgs were found")
-                    )
+                    pp.emph("   The following ")
+                    + red("invalid")
+                    + pp.emph(" binpkgs were found")
                 )
                 output.set_colors("invalid")
                 output.list_pkgs(invalids)

pym/gentoolkit/eclean/exclude.py

@@ -6,6 +6,7 @@
 
 import os
 import re
+
 import portage
 
 # Misc. shortcuts to some portage stuff:
@@ -206,8 +207,7 @@ def exclDictExpand(exclude):
             d[cp] = None
     if "anti-packages" in exclude:
         for cp in exclude["anti-packages"]:
-            if cp in d:
-                del d[cp]
+            d.pop(cp, None)
     return d
 
 

pym/gentoolkit/eclean/output.py

@@ -5,7 +5,9 @@
 
 
 import sys
-from portage.output import blue, yellow, teal, green, red
+
+from portage.output import blue, green, red, teal, yellow
+
 from gentoolkit.pprinter import cpv, number
 
 

pym/gentoolkit/eclean/search.py

@@ -14,11 +14,11 @@
 from typing import Optional, Set
 
 import portage
+from portage.binrepo.config import BinRepoConfigLoader
 from portage.dep import Atom, use_reduce
 from portage.dep._slot_operator import strip_slots
 from portage.dep.libc import find_libc_deps, strip_libc_deps
 from portage.exception import InvalidDependString
-from portage.binrepo.config import BinRepoConfigLoader
 
 import gentoolkit.pprinter as pp
 from gentoolkit.eclean.exclude import (

pym/gentoolkit/ekeyword/ekeyword.py

@@ -44,11 +44,11 @@
 import subprocess
 import sys
 
-from gentoolkit.profile import load_profile_data
-
 import portage
 from portage.output import colorize, nocolor
 
+from gentoolkit.profile import load_profile_data
+
 __version__ = "@VERSION@"
 
 # Operation object that describes how to perform a change.

pym/gentoolkit/ekeyword/test_ekeyword.py

@@ -9,7 +9,6 @@
 import subprocess
 import tempfile
 import unittest
-
 from unittest import mock
 
 from gentoolkit.ekeyword import ekeyword