reblackify the code

Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>

106 files changed, 7 insertions, 266 deletions

diff --git a/src/pkgcore/binpkg/remote.py b/src/pkgcore/binpkg/remote.py
index ee8989f67..e93b39110 100644
--- a/src/pkgcore/binpkg/remote.py
+++ b/src/pkgcore/binpkg/remote.py
@@ -186,7 +186,6 @@ class PackagesCacheV0(cache.bulk):
         d = {}
         sequences = cls._pkg_attr_sequences
         for key in cls._stored_attrs:
-
             value = getattr(pkg, key)
             if key in sequences:
                 value = " ".join(sorted(value))
diff --git a/src/pkgcore/binpkg/repository.py b/src/pkgcore/binpkg/repository.py
index 549d50b70..e4b8acc63 100644
--- a/src/pkgcore/binpkg/repository.py
+++ b/src/pkgcore/binpkg/repository.py
@@ -28,7 +28,6 @@ from .xpak import Xpak
 
 
 class force_unpacking(triggers.base):
-
     required_csets = ("new_cset",)
     priority = 5
     _hooks = ("sanity_check",)
@@ -186,7 +185,6 @@ class StackedXpakDict(DictMixin):
 
 
 class StackedCache(StackedDict):
-
     __externally_mutable__ = True
 
     def __delitem__(self, key):
@@ -194,7 +192,6 @@ class StackedCache(StackedDict):
 
 
 class tree(prototype.tree):
-
     # yes, the period is required. no, do not try and remove it
     # (harring says it stays)
     extension = ".tbz2"
diff --git a/src/pkgcore/cache/__init__.py b/src/pkgcore/cache/__init__.py
index 6e7ee4b5d..798841b22 100644
--- a/src/pkgcore/cache/__init__.py
+++ b/src/pkgcore/cache/__init__.py
@@ -282,7 +282,6 @@ class base:
 
 
 class bulk(base):
-
     default_sync_rate = 100
 
     def __init__(self, *args, **kwds):
diff --git a/src/pkgcore/cache/flat_hash.py b/src/pkgcore/cache/flat_hash.py
index 39913dd4a..494d856c9 100644
--- a/src/pkgcore/cache/flat_hash.py
+++ b/src/pkgcore/cache/flat_hash.py
@@ -142,7 +142,6 @@ class database(fs_template.FsBased):
 
 
 class md5_cache(database):
-
     chf_type = "md5"
     eclass_chf_types = ("md5",)
     chf_base = 16
diff --git a/src/pkgcore/config/__init__.py b/src/pkgcore/config/__init__.py
index 83e58a568..0fa881824 100644
--- a/src/pkgcore/config/__init__.py
+++ b/src/pkgcore/config/__init__.py
@@ -21,7 +21,7 @@ def load_config(
     skip_config_files: bool = False,
     profile_override: typing.Optional[str] = None,
     location: typing.Optional[str] = None,
-    **kwargs
+    **kwargs,
 ) -> central.CompatConfigManager:
     """The main entry point for any code looking to use pkgcore.
 
diff --git a/src/pkgcore/config/basics.py b/src/pkgcore/config/basics.py
index 7576e7182..95792ea26 100644
--- a/src/pkgcore/config/basics.py
+++ b/src/pkgcore/config/basics.py
@@ -629,7 +629,6 @@ def parse_config_file(path: str, parser):
 
 
 class ConfigSource:
-
     description = "No description available"
 
     def sections(self):
diff --git a/src/pkgcore/config/central.py b/src/pkgcore/config/central.py
index 53609221b..9ac4d9f57 100644
--- a/src/pkgcore/config/central.py
+++ b/src/pkgcore/config/central.py
@@ -83,7 +83,6 @@ class _ConfigStack(defaultdict[str, list[typing.Any]]):
         return None
 
     def render_prepends(self, manager, key: str, type_name: str) -> list[typing.Any]:
-
         results = []
         # keep in mind that the sequence we get is a top -> bottom walk of the config
         # as such for this operation we have to reverse it when building the content-
diff --git a/src/pkgcore/config/domain.py b/src/pkgcore/config/domain.py
index 8d790ba81..a4ba43e9c 100644
--- a/src/pkgcore/config/domain.py
+++ b/src/pkgcore/config/domain.py
@@ -31,7 +31,6 @@ class Failure(PkgcoreException):
 # yes this is basically empty. will fill it out as the base is better
 # identified.
 class domain:
-
     fetcher = None
     tmpdir = None
     _triggers = ()
diff --git a/src/pkgcore/config/errors.py b/src/pkgcore/config/errors.py
index 4f75a1045..dcbfbbd9b 100644
--- a/src/pkgcore/config/errors.py
+++ b/src/pkgcore/config/errors.py
@@ -81,7 +81,6 @@ class CollapseInheritOnly(ConfigurationError):
 
 
 class InstantiationError(ConfigurationError):
-
     _txt = "Failed instantiating section %r%s"
 
     def __init__(self, section_name, message=None):
@@ -98,7 +97,6 @@ class InstantiationError(ConfigurationError):
 
 
 class AutoloadInstantiationError(InstantiationError):
-
     _txt = "Failed loading autoload section %r%s"
 
 
diff --git a/src/pkgcore/ebuild/atom.py b/src/pkgcore/ebuild/atom.py
index 2efbfd8b1..f8725f607 100644
--- a/src/pkgcore/ebuild/atom.py
+++ b/src/pkgcore/ebuild/atom.py
@@ -691,7 +691,6 @@ class atom(boolean.AndRestriction, metaclass=klass.generic_equality):
 
 
 class transitive_use_atom(atom):
-
     __slots__ = ()
     __inst_caching__ = True
     _nontransitive_use_atom = atom
diff --git a/src/pkgcore/ebuild/cpv.py b/src/pkgcore/ebuild/cpv.py
index 1a5d7ab8d..774051e07 100644
--- a/src/pkgcore/ebuild/cpv.py
+++ b/src/pkgcore/ebuild/cpv.py
@@ -132,7 +132,6 @@ def ver_cmp(ver1: str, rev1: str, ver2: str, rev2: str) -> int:
 
     # If the dotted strings are equal, we can skip doing a detailed comparison.
     if parts1[0] != parts2[0]:
-
         # First split up the dotted strings into their components.
         ver_parts1 = parts1[0].split(".")
         ver_parts2 = parts2[0].split(".")
@@ -154,7 +153,6 @@ def ver_cmp(ver1: str, rev1: str, ver2: str, rev2: str) -> int:
 
         # Iterate through the components
         for v1, v2 in zip(ver_parts1, ver_parts2):
-
             # If the string components are equal, the numerical
             # components will be equal too.
             if v1 == v2:
@@ -196,7 +194,6 @@ def ver_cmp(ver1: str, rev1: str, ver2: str, rev2: str) -> int:
 
     # Iterate through the suffixes
     for x in range(max(parts1_len, parts2_len)):
-
         # If we're at the end of one of our lists, we need to use
         # the next suffix from the other list to decide who wins.
         if x == parts1_len:
@@ -466,7 +463,6 @@ class CPV(base.base):
 
 
 class VersionedCPV(CPV):
-
     __slots__ = ()
 
     def __init__(self, *args):
@@ -474,7 +470,6 @@ class VersionedCPV(CPV):
 
 
 class UnversionedCPV(CPV):
-
     __slots__ = ()
 
     def __init__(self, *args):
diff --git a/src/pkgcore/ebuild/domain.py b/src/pkgcore/ebuild/domain.py
index d6ddf38d5..3339019dc 100644
--- a/src/pkgcore/ebuild/domain.py
+++ b/src/pkgcore/ebuild/domain.py
@@ -240,7 +240,6 @@ def load_property(
 # instantiation manglers, and then the ebuild specific chunk (which is
 # selected by config)
 class domain(config_domain):
-
     # XXX ouch, verify this crap and add defaults and stuff
     _types = dict.fromkeys(
         (
diff --git a/src/pkgcore/ebuild/eapi.py b/src/pkgcore/ebuild/eapi.py
index 3754402e0..b5f9d0291 100644
--- a/src/pkgcore/ebuild/eapi.py
+++ b/src/pkgcore/ebuild/eapi.py
@@ -134,12 +134,10 @@ eapi_optionals = ImmutableDict(
 
 
 class _optionals_cls(ImmutableDict):
-
     inject_getitem_as_getattr(locals())
 
 
 class EAPI(metaclass=klass.immutable_instance):
-
     known_eapis = WeakValueDictionary()
     unknown_eapis = WeakValueDictionary()
 
diff --git a/src/pkgcore/ebuild/ebd.py b/src/pkgcore/ebuild/ebd.py
index f85b5792d..1a47ab77e 100644
--- a/src/pkgcore/ebuild/ebd.py
+++ b/src/pkgcore/ebuild/ebd.py
@@ -479,7 +479,6 @@ class ebd:
 
 
 class setup_mixin:
-
     setup_is_for_src = True
 
     def setup(self, setup_phase_override=None):
@@ -992,7 +991,6 @@ class buildable(ebd, setup_mixin, format.build):
 
 
 class binpkg_localize(ebd, setup_mixin, format.build):
-
     stage_depends = {"finalize": "setup", "setup": "start"}
     setup_is_for_src = False
 
@@ -1010,7 +1008,6 @@ class binpkg_localize(ebd, setup_mixin, format.build):
 
 
 class ebuild_operations:
-
     _checks = []
 
     def _register_check(checks):
diff --git a/src/pkgcore/ebuild/ebd_ipc.py b/src/pkgcore/ebuild/ebd_ipc.py
index 84842546a..ea6b9b99f 100644
--- a/src/pkgcore/ebuild/ebd_ipc.py
+++ b/src/pkgcore/ebuild/ebd_ipc.py
@@ -636,7 +636,6 @@ class Dolib_a(Dolib):
 
 
 class _Symlink(_InstallWrapper):
-
     arg_parser = IpcArgumentParser()
     arg_parser.add_argument("source")
     arg_parser.add_argument("target")
@@ -839,7 +838,6 @@ class Dohtml(_InstallWrapper):
 
 
 class _AlterFiles(IpcCommand):
-
     arg_parser = IpcArgumentParser()
     arg_parser.add_argument("-x", dest="excludes", action="store_true")
     arg_parser.add_argument("targets", nargs="+")
@@ -879,7 +877,6 @@ class Dostrip(_AlterFiles):
 
 
 class _QueryCmd(IpcCommand):
-
     arg_parser = IpcArgumentParser()
     arg_parser.add_argument("atom", type=atom_mod.atom)
 
@@ -1064,7 +1061,6 @@ class Eapply_User(IpcCommand):
 
 
 class Unpack(IpcCommand):
-
     arg_parser = IpcArgumentParser()
     arg_parser.add_argument("targets", nargs="+")
 
@@ -1156,7 +1152,6 @@ class Unpack(IpcCommand):
 
 
 class FilterEnv(IpcCommand):
-
     arg_parser = IpcArgumentParser()
     filtering = arg_parser.add_argument_group("Environment filtering options")
     filtering.add_argument(
diff --git a/src/pkgcore/ebuild/ebuild_built.py b/src/pkgcore/ebuild/ebuild_built.py
index a2051ba02..106fb6b94 100644
--- a/src/pkgcore/ebuild/ebuild_built.py
+++ b/src/pkgcore/ebuild/ebuild_built.py
@@ -194,7 +194,6 @@ class package(ebuild_src.base):
 
 
 class fresh_built_package(package):
-
     __slots__ = ()
     _is_from_source = True
 
diff --git a/src/pkgcore/ebuild/ebuild_src.py b/src/pkgcore/ebuild/ebuild_src.py
index 87a02295e..6d5f8e452 100644
--- a/src/pkgcore/ebuild/ebuild_src.py
+++ b/src/pkgcore/ebuild/ebuild_src.py
@@ -430,7 +430,6 @@ class base(metadata.package):
 
 
 class package(base):
-
     __slots__ = ("_shared_pkg_data",)
 
     def __init__(self, shared_pkg_data, *args, **kwargs):
@@ -461,7 +460,6 @@ class package(base):
 
 
 class package_factory(metadata.factory):
-
     child_class = package
 
     # For the plugin system.
diff --git a/src/pkgcore/ebuild/eclass_cache.py b/src/pkgcore/ebuild/eclass_cache.py
index 08de59487..402b15959 100644
--- a/src/pkgcore/ebuild/eclass_cache.py
+++ b/src/pkgcore/ebuild/eclass_cache.py
@@ -84,7 +84,6 @@ class base:
 
 
 class cache(base):
-
     pkgcore_config_type = ConfigHint(
         types={"path": "str", "location": "str"}, typename="eclass_cache"
     )
diff --git a/src/pkgcore/ebuild/formatter.py b/src/pkgcore/ebuild/formatter.py
index a592ac70b..446cf9ad1 100644
--- a/src/pkgcore/ebuild/formatter.py
+++ b/src/pkgcore/ebuild/formatter.py
@@ -434,7 +434,6 @@ class PortageFormatter(CountingFormatter):
 
         # updating or rebuilding pkg
         if old_pkg_iuse is not None and old_pkg_use is not None:
-
             old_enabled = set(old_pkg_iuse) & set(old_pkg_use)
             old_disabled = set(old_pkg_iuse) - set(old_pkg_use)
             removed = set(old_pkg_iuse) - set(pkg_iuse)
diff --git a/src/pkgcore/ebuild/misc.py b/src/pkgcore/ebuild/misc.py
index eafcf6f60..674e593c3 100644
--- a/src/pkgcore/ebuild/misc.py
+++ b/src/pkgcore/ebuild/misc.py
@@ -141,7 +141,6 @@ def incremental_expansion_license(
 
 
 class IncrementalsDict(mappings.DictMixin):
-
     disable_py3k_rewriting = True
 
     def __init__(self, incrementals, **kwds):
@@ -168,7 +167,6 @@ class IncrementalsDict(mappings.DictMixin):
 
 
 class collapsed_restrict_to_data(metaclass=generic_equality):
-
     __attr_comparison__ = ("defaults", "freeform", "atoms", "__class__")
     incremental = True
 
@@ -386,7 +384,6 @@ def _build_cp_atom_payload(sequence, restrict, payload_form=False):
 
 
 class ChunkedDataDict(metaclass=generic_equality):
-
     __attr_comparison__ = ("_global_settings", "_dict")
 
     def __init__(self):
diff --git a/src/pkgcore/ebuild/portageq.py b/src/pkgcore/ebuild/portageq.py
index 250736f20..3613b53af 100644
--- a/src/pkgcore/ebuild/portageq.py
+++ b/src/pkgcore/ebuild/portageq.py
@@ -60,7 +60,6 @@ def _render_atom(value, namespace, attr):
 
 
 class BaseCommand(arghparse.ArgparseCommand):
-
     required_arg_count = 0
     has_optional_args = False
     arg_spec = ()
diff --git a/src/pkgcore/ebuild/profiles.py b/src/pkgcore/ebuild/profiles.py
index 83bcda09a..660fcea8a 100644
--- a/src/pkgcore/ebuild/profiles.py
+++ b/src/pkgcore/ebuild/profiles.py
@@ -162,7 +162,6 @@ _Packages = namedtuple("_Packages", ("system", "profile"))
 
 
 class ProfileNode(metaclass=caching.WeakInstMeta):
-
     __inst_caching__ = True
     _repo_map = None
 
@@ -603,7 +602,6 @@ class ProfileNode(metaclass=caching.WeakInstMeta):
 
 
 class EmptyRootNode(ProfileNode):
-
     __inst_caching__ = True
 
     parents = ()
@@ -618,7 +616,6 @@ class EmptyRootNode(ProfileNode):
 
 
 class ProfileStack:
-
     _node_kls = ProfileNode
 
     def __init__(self, profile):
@@ -859,7 +856,6 @@ class ProfileStack:
 
 
 class OnDiskProfile(ProfileStack):
-
     pkgcore_config_type = ConfigHint(
         types={"basepath": "str", "profile": "str"},
         required=("basepath", "profile"),
@@ -915,7 +911,6 @@ class OnDiskProfile(ProfileStack):
 
 
 class UserProfileNode(ProfileNode):
-
     parent_node_kls = ProfileNode
 
     def __init__(self, path, parent_path):
@@ -932,7 +927,6 @@ class UserProfileNode(ProfileNode):
 
 
 class UserProfile(OnDiskProfile):
-
     pkgcore_config_type = ConfigHint(
         types={"user_path": "str", "parent_path": "str", "parent_profile": "str"},
         required=("user_path", "parent_path", "parent_profile"),
diff --git a/src/pkgcore/ebuild/repo_objs.py b/src/pkgcore/ebuild/repo_objs.py
index 2bcb1b407..3359305bb 100644
--- a/src/pkgcore/ebuild/repo_objs.py
+++ b/src/pkgcore/ebuild/repo_objs.py
@@ -231,7 +231,6 @@ class MetadataXml:
 
 
 class LocalMetadataXml(MetadataXml):
-
     __slots__ = ()
 
     def _parse_xml(self):
@@ -248,7 +247,6 @@ class LocalMetadataXml(MetadataXml):
 
 
 class SharedPkgData:
-
     __slots__ = ("__weakref__", "metadata_xml", "manifest")
 
     def __init__(self, metadata_xml, manifest):
@@ -465,7 +463,6 @@ class ProjectsXml:
 
 
 class LocalProjectsXml(ProjectsXml):
-
     __slots__ = ()
 
     def _parse_xml(self):
@@ -477,7 +474,6 @@ class LocalProjectsXml(ProjectsXml):
 
 
 class Licenses(metaclass=WeakInstMeta):
-
     __inst_caching__ = True
     __slots__ = (
         "_base",
@@ -600,7 +596,6 @@ class Licenses(metaclass=WeakInstMeta):
 
 
 class _immutable_attr_dict(mappings.ImmutableDict):
-
     __slots__ = ()
 
     mappings.inject_getitem_as_getattr(locals())
@@ -612,7 +607,6 @@ _KnownProfile = namedtuple(
 
 
 class Profiles(klass.ImmutableInstance):
-
     __slots__ = ("config", "profiles_base", "_profiles")
     __inst_caching__ = True
 
@@ -710,7 +704,6 @@ class Profiles(klass.ImmutableInstance):
 
 
 class OverlayedProfiles(Profiles):
-
     __inst_caching__ = True
     __slots__ = ("_profiles_instances", "_profiles_sources")
 
@@ -959,6 +952,7 @@ class RepoConfig(syncable.tree, klass.ImmutableInstance, metaclass=WeakInstMeta)
     @klass.jit_attr
     def use_desc(self):
         """Global USE flags for the repo."""
+
         # todo: convert this to using a common exception base, with
         # conversion of ValueErrors...
         def converter(key):
diff --git a/src/pkgcore/ebuild/repository.py b/src/pkgcore/ebuild/repository.py
index 4a06118a0..ce61c4544 100644
--- a/src/pkgcore/ebuild/repository.py
+++ b/src/pkgcore/ebuild/repository.py
@@ -215,7 +215,6 @@ class ProvidesRepo(util.SimpleTree):
             self.__dict__.update(kwds)
 
     class PkgProvided(ebuild_src.base):
-
         __slots__ = ("arches", "use")
 
         package_is_real = False
diff --git a/src/pkgcore/ebuild/resolver.py b/src/pkgcore/ebuild/resolver.py
index b7896f3ac..f257a7730 100644
--- a/src/pkgcore/ebuild/resolver.py
+++ b/src/pkgcore/ebuild/resolver.py
@@ -135,7 +135,6 @@ _vdb_restrict = packages.OrRestriction(
 
 
 class empty_tree_merge_plan(plan.merge_plan):
-
     _vdb_restriction = _vdb_restrict
 
     def __init__(self, dbs, *args, **kwds):
diff --git a/src/pkgcore/ebuild/restricts.py b/src/pkgcore/ebuild/restricts.py
index 9c05ed327..6d4c1804c 100644
--- a/src/pkgcore/ebuild/restricts.py
+++ b/src/pkgcore/ebuild/restricts.py
@@ -144,7 +144,6 @@ class _VersionMatch(restriction.base, metaclass=generic_equality):
 
 
 class VersionMatch(packages.PackageRestriction):
-
     __slots__ = ()
     __inst_caching__ = True
 
@@ -157,7 +156,6 @@ class VersionMatch(packages.PackageRestriction):
 
 
 class SlotDep(packages.PackageRestriction):
-
     __slots__ = ()
     __inst_caching__ = True
 
@@ -167,7 +165,6 @@ class SlotDep(packages.PackageRestriction):
 
 
 class SubSlotDep(packages.PackageRestriction):
-
     __slots__ = ()
     __inst_caching__ = True
 
@@ -177,7 +174,6 @@ class SubSlotDep(packages.PackageRestriction):
 
 
 class CategoryDep(packages.PackageRestriction):
-
     __slots__ = ()
     __inst_caching__ = True
 
@@ -186,7 +182,6 @@ class CategoryDep(packages.PackageRestriction):
 
 
 class PackageDep(packages.PackageRestriction):
-
     __slots__ = ()
     __inst_caching__ = True
 
@@ -195,7 +190,6 @@ class PackageDep(packages.PackageRestriction):
 
 
 class RepositoryDep(packages.PackageRestriction):
-
     __slots__ = ()
     __inst_caching__ = True
 
@@ -204,7 +198,6 @@ class RepositoryDep(packages.PackageRestriction):
 
 
 class StaticUseDep(packages.PackageRestriction):
-
     __slots__ = ()
     __inst_caching__ = True
 
@@ -227,7 +220,6 @@ class StaticUseDep(packages.PackageRestriction):
 
 
 class _UseDepDefaultContainment(values.ContainmentMatch):
-
     __slots__ = ("if_missing",)
 
     def __init__(self, if_missing, vals, negate=False):
@@ -288,7 +280,6 @@ class _UseDepDefaultContainment(values.ContainmentMatch):
 
 
 class UseDepDefault(packages.PackageRestrictionMulti):
-
     __slots__ = ()
     __inst_caching__ = True
 
diff --git a/src/pkgcore/ebuild/triggers.py b/src/pkgcore/ebuild/triggers.py
index 10c51464c..14ef725ab 100644
--- a/src/pkgcore/ebuild/triggers.py
+++ b/src/pkgcore/ebuild/triggers.py
@@ -175,7 +175,6 @@ def perform_env_update(root, skip_ldso_update=False):
 
 
 class env_update(triggers.base):
-
     required_csets = ()
     priority = 5
     _hooks = ("post_unmerge", "post_merge")
@@ -242,7 +241,6 @@ def gen_collision_ignore_filter(offset, extra_ignores=()):
 
 
 class ConfigProtectInstall(triggers.base):
-
     required_csets = ("install_existing", "install")
     priority = 100
     _hooks = ("pre_merge",)
@@ -324,7 +322,6 @@ class ConfigProtectInstall(triggers.base):
 
 
 class ConfigProtectInstall_restore(triggers.base):
-
     required_csets = ("install",)
     priority = 10
     _hooks = ("post_merge",)
@@ -344,7 +341,6 @@ class ConfigProtectInstall_restore(triggers.base):
 
 
 class ConfigProtectUninstall(triggers.base):
-
     required_csets = ("uninstall_existing", "uninstall")
     _hooks = ("pre_unmerge",)
 
@@ -369,7 +365,6 @@ class ConfigProtectUninstall(triggers.base):
 
 
 class UninstallIgnore(triggers.base):
-
     required_csets = {
         const.REPLACE_MODE: ("uninstall_existing", "uninstall", "old_cset"),
         const.UNINSTALL_MODE: ("uninstall_existing", "uninstall"),
@@ -398,7 +393,6 @@ class UninstallIgnore(triggers.base):
 
 
 class preinst_contents_reset(triggers.base):
-
     required_csets = ("new_cset",)
     priority = 1
     _hooks = ("pre_merge",)
@@ -518,7 +512,6 @@ class ProtectOwned(FileCollision):
 
 
 class install_into_symdir_protect(triggers.base):
-
     required_csets = {
         const.INSTALL_MODE: ("install", "install_existing"),
         const.REPLACE_MODE: ("install", "install_existing", "old_cset"),
@@ -557,7 +550,6 @@ class install_into_symdir_protect(triggers.base):
 
 
 class InfoRegen(triggers.InfoRegen):
-
     _label = "ebuild info regen"
 
     def register(self, engine):
@@ -635,7 +627,6 @@ def register_multilib_strict_trigger(opts):
 
 
 class FixImageSymlinks(triggers.base):
-
     required_csets = ("new_cset",)
     _hooks = ("pre_merge",)
 
diff --git a/src/pkgcore/fetch/__init__.py b/src/pkgcore/fetch/__init__.py
index 39526c6e6..d77903585 100644
--- a/src/pkgcore/fetch/__init__.py
+++ b/src/pkgcore/fetch/__init__.py
@@ -100,12 +100,10 @@ class unknown_mirror(mirror):
 
 
 class default_mirror(mirror):
-
     __slots__ = ()
 
 
 class uri_list:
-
     __slots__ = ("_uri_source", "filename", "__weakref__")
 
     def __init__(self, filename):
diff --git a/src/pkgcore/fetch/custom.py b/src/pkgcore/fetch/custom.py
index d5c48186b..fce7d7c21 100644
--- a/src/pkgcore/fetch/custom.py
+++ b/src/pkgcore/fetch/custom.py
@@ -24,7 +24,6 @@ class MalformedCommand(errors.FetchError):
 
 
 class fetcher(base.fetcher):
-
     pkgcore_config_type = ConfigHint(
         types={
             "userpriv": "bool",
diff --git a/src/pkgcore/fs/contents.py b/src/pkgcore/fs/contents.py
index 434bd5bea..a403b8040 100644
--- a/src/pkgcore/fs/contents.py
+++ b/src/pkgcore/fs/contents.py
@@ -43,7 +43,6 @@ class contentsSet(metaclass=generic_equality):
     __dict_kls__ = dict
 
     def __init__(self, initial=None, mutable=True):
-
         """
         :param initial: initial fs objs for this set
         :type initial: sequence
@@ -66,7 +65,6 @@ class contentsSet(metaclass=generic_equality):
         return f"{name}([{contents}])"
 
     def add(self, obj):
-
         """
         add a new fs obj to the set
 
@@ -81,7 +79,6 @@ class contentsSet(metaclass=generic_equality):
         self._dict[obj.location] = obj
 
     def __delitem__(self, obj):
-
         """
         remove a fs obj to the set
 
diff --git a/src/pkgcore/fs/fs.py b/src/pkgcore/fs/fs.py
index f1bffe373..9149750eb 100644
--- a/src/pkgcore/fs/fs.py
+++ b/src/pkgcore/fs/fs.py
@@ -69,7 +69,6 @@ class fsBase:
     klass.inject_immutable_instance(locals())
 
     def __init__(self, location, strict=True, **d):
-
         d["location"] = normpath(location)
 
         s = object.__setattr__
diff --git a/src/pkgcore/fs/livefs.py b/src/pkgcore/fs/livefs.py
index 14c41f23d..0becb0046 100644
--- a/src/pkgcore/fs/livefs.py
+++ b/src/pkgcore/fs/livefs.py
@@ -31,7 +31,7 @@ def gen_obj(
     chksum_handlers=None,
     real_location=None,
     stat_func=os.lstat,
-    **overrides
+    **overrides,
 ):
     """
     given a fs path, and an optional stat, create an appropriate fs obj.
@@ -226,7 +226,6 @@ def scan(*a, **kw):
 
 
 class _realpath_dir:
-
     _realpath_func = staticmethod(os.path.realpath)
 
     def __init__(self):
diff --git a/src/pkgcore/fs/ops.py b/src/pkgcore/fs/ops.py
index 1f83b9f02..f49a2e457 100644
--- a/src/pkgcore/fs/ops.py
+++ b/src/pkgcore/fs/ops.py
@@ -18,7 +18,6 @@ from .livefs import gen_obj
 
 
 def ensure_perms(d1, d2=None):
-
     """Enforce a fs objects attributes on the livefs.
 
     Attributes enforced are permissions, mtime, uid, gid.
@@ -36,7 +35,6 @@ def ensure_perms(d1, d2=None):
     if d2 is None:
         do_mode, do_chown, do_mtime = True, True, True
     else:
-
         do_mode = False
         try:
             if fs.isdir(d1) and fs.isdir(d2):
@@ -200,7 +198,6 @@ def do_link(src, trg):
 
 
 def merge_contents(cset, offset=None, callback=None):
-
     """
     merge a :class:`pkgcore.fs.contents.contentsSet` instance to the livefs
 
@@ -295,7 +292,6 @@ def merge_contents(cset, offset=None, callback=None):
 
 
 def unmerge_contents(cset, offset=None, callback=None):
-
     """
     unmerge a :obj:`pkgcore.fs.contents.contentsSet` instance to the livefs
 
diff --git a/src/pkgcore/merge/engine.py b/src/pkgcore/merge/engine.py
index efbd9e817..50f6549f5 100644
--- a/src/pkgcore/merge/engine.py
+++ b/src/pkgcore/merge/engine.py
@@ -47,7 +47,6 @@ def map_new_cset_livefs(engine, csets, cset_name="new_cset"):
 
 
 class MergeEngine:
-
     install_hooks = {
         x: [] for x in ("sanity_check", "pre_merge", "merge", "post_merge", "final")
     }
diff --git a/src/pkgcore/merge/triggers.py b/src/pkgcore/merge/triggers.py
index 3994c21ac..c484ad8c7 100644
--- a/src/pkgcore/merge/triggers.py
+++ b/src/pkgcore/merge/triggers.py
@@ -277,7 +277,6 @@ def update_elf_hints(root):
 
 
 class ldconfig(base):
-
     required_csets = ()
     priority = 10
     _engine_types = None
@@ -334,7 +333,6 @@ class ldconfig(base):
 
 
 class InfoRegen(base):
-
     required_csets = ()
 
     # could implement this to look at csets, and do incremental removal and
@@ -423,7 +421,6 @@ class InfoRegen(base):
 
 
 class merge(base):
-
     required_csets = ("install",)
     _engine_types = INSTALLING_MODES
     _hooks = ("merge",)
@@ -435,7 +432,6 @@ class merge(base):
 
 
 class unmerge(base):
-
     required_csets = ("uninstall",)
     _engine_types = UNINSTALLING_MODES
     _hooks = ("unmerge",)
@@ -449,7 +445,6 @@ class unmerge(base):
 
 
 class BaseSystemUnmergeProtection(base):
-
     required_csets = ("uninstall",)
     priority = -100
     _engine_types = UNINSTALLING_MODES
@@ -486,7 +481,6 @@ class BaseSystemUnmergeProtection(base):
 
 
 class fix_uid_perms(base):
-
     required_csets = ("new_cset",)
     _hooks = ("pre_merge",)
     _engine_types = INSTALLING_MODES
@@ -504,7 +498,6 @@ class fix_uid_perms(base):
 
 
 class fix_gid_perms(base):
-
     required_csets = ("new_cset",)
     _hooks = ("pre_merge",)
     _engine_types = INSTALLING_MODES
@@ -522,7 +515,6 @@ class fix_gid_perms(base):
 
 
 class fix_set_bits(base):
-
     required_csets = ("new_cset",)
     _hooks = ("pre_merge",)
     _engine_types = INSTALLING_MODES
@@ -548,7 +540,6 @@ class fix_set_bits(base):
 
 
 class detect_world_writable(base):
-
     required_csets = ("new_cset",)
     _hooks = ("pre_merge",)
     _engine_types = INSTALLING_MODES
@@ -572,7 +563,6 @@ class detect_world_writable(base):
 
 
 class PruneFiles(base):
-
     required_csets = ("new_cset",)
     _hooks = ("pre_merge",)
     _engine_types = INSTALLING_MODES
@@ -594,7 +584,6 @@ class PruneFiles(base):
 
 
 class CommonDirectoryModes(base):
-
     required_csets = ("new_cset",)
     _hooks = ("pre_merge",)
     _engine_types = INSTALLING_MODES
@@ -619,7 +608,6 @@ class CommonDirectoryModes(base):
 
 
 class BlockFileType(base):
-
     required_csets = ("new_cset",)
     _hooks = ("pre_merge",)
     _engine_types = INSTALLING_MODES
@@ -654,7 +642,6 @@ class BlockFileType(base):
 
 
 class SavePkg(base):
-
     required_csets = ("raw_new_cset",)
     priority = 90
     _hooks = ("sanity_check",)
@@ -722,7 +709,6 @@ class SavePkgUnmergingIfInPkgset(SavePkgUnmerging):
 
 
 class BinaryDebug(ThreadedTrigger):
-
     required_csets = ("install",)
     _engine_types = INSTALLING_MODES
 
diff --git a/src/pkgcore/operations/__init__.py b/src/pkgcore/operations/__init__.py
index b59789a50..e1d188139 100644
--- a/src/pkgcore/operations/__init__.py
+++ b/src/pkgcore/operations/__init__.py
@@ -31,7 +31,6 @@ class OperationError(PkgcoreException):
 
 
 class base:
-
     __required__ = frozenset()
 
     UNSUPPORTED = object()
diff --git a/src/pkgcore/operations/domain.py b/src/pkgcore/operations/domain.py
index b3a703699..41a24ac03 100644
--- a/src/pkgcore/operations/domain.py
+++ b/src/pkgcore/operations/domain.py
@@ -30,7 +30,6 @@ class Failure(PkgcoreException):
 
 
 class base(metaclass=ForcedDepends):
-
     stage_depends = {}
 
     stage_hooks = []
diff --git a/src/pkgcore/operations/format.py b/src/pkgcore/operations/format.py
index dfbd615a9..22b975b46 100644
--- a/src/pkgcore/operations/format.py
+++ b/src/pkgcore/operations/format.py
@@ -83,7 +83,6 @@ class fetch_base:
 
 
 class operations(_operations_mod.base):
-
     _fetch_kls = fetch_base
 
     def __init__(
@@ -158,7 +157,6 @@ class operations(_operations_mod.base):
 
 
 class build_operations(operations):
-
     __required__ = frozenset(["build"])
 
     def _cmd_api_build(self, observer=None, failed=False, clean=True, **kwargs):
@@ -174,7 +172,6 @@ class build_operations(operations):
 
 
 class build_base(metaclass=ForcedDepends):
-
     stage_depends = {"finish": "start"}
 
     def __init__(self, domain, observer):
@@ -189,7 +186,6 @@ class build_base(metaclass=ForcedDepends):
 
 
 class build(build_base):
-
     stage_depends = {
         "setup": "start",
         "unpack": "setup",
@@ -251,7 +247,6 @@ class build(build_base):
 
 
 class install(build_base):
-
     stage_depends = {
         "preinst": "start",
         "postinst": "preinst",
@@ -279,7 +274,6 @@ class install(build_base):
 
 
 class uninstall(build_base):
-
     stage_depends = {
         "prerm": "start",
         "postrm": "prerm",
@@ -311,7 +305,6 @@ class uninstall(build_base):
 
 
 class replace(install, uninstall):
-
     stage_depends = {
         "finalize": "postinst",
         "postinst": "postrm",
@@ -327,7 +320,6 @@ class replace(install, uninstall):
 
 
 class empty_build_op(build_base):
-
     stage_depends = {}
 
     def __init__(self, pkg, observer=None, clean=False):
diff --git a/src/pkgcore/operations/repo.py b/src/pkgcore/operations/repo.py
index fedbc67b8..39cc2f05b 100644
--- a/src/pkgcore/operations/repo.py
+++ b/src/pkgcore/operations/repo.py
@@ -41,7 +41,6 @@ class Failure(PkgcoreException):
 
 
 class base(metaclass=ForcedDepends):
-
     stage_depends = {}
 
     def __init__(self, repo, observer):
@@ -70,7 +69,6 @@ class base(metaclass=ForcedDepends):
 
 
 class install(base):
-
     stage_depends = {
         "finish": "_notify_repo_add",
         "_notify_repo_add": "finalize_data",
@@ -96,7 +94,6 @@ class install(base):
 
 
 class uninstall(base):
-
     stage_depends = {
         "finish": "_notify_repo_remove",
         "_notify_repo_remove": "finalize_data",
@@ -119,7 +116,6 @@ class uninstall(base):
 
 
 class replace(install, uninstall):
-
     stage_depends = {
         "finish": "_notify_repo_add",
         "_notify_repo_add": "finalize_data",
@@ -290,7 +286,6 @@ class operations(sync_operations):
 
 
 class operations_proxy(operations):
-
     # cache this; this is to prevent the target operations mutating resulting
     # in our proxy setup not matching the target.
     @klass.cached_property
diff --git a/src/pkgcore/package/base.py b/src/pkgcore/package/base.py
index 8a4e0c16b..b04b58134 100644
--- a/src/pkgcore/package/base.py
+++ b/src/pkgcore/package/base.py
@@ -15,7 +15,6 @@ from . import errors
 
 
 class base(klass.SlotsPicklingMixin, metaclass=klass.immutable_instance):
-
     built = False
     configurable = False
     _operations = format.operations
@@ -40,7 +39,6 @@ class base(klass.SlotsPicklingMixin, metaclass=klass.immutable_instance):
 
 
 class wrapper(base):
-
     __slots__ = ("_raw_pkg", "_domain")
 
     def operations(self, domain, **kwds):
diff --git a/src/pkgcore/pkgsets/live_rebuild_set.py b/src/pkgcore/pkgsets/live_rebuild_set.py
index ec18902ac..baa2d93fa 100644
--- a/src/pkgcore/pkgsets/live_rebuild_set.py
+++ b/src/pkgcore/pkgsets/live_rebuild_set.py
@@ -9,7 +9,6 @@ from .installed import VersionedInstalled
 
 
 class EclassConsumerSet(VersionedInstalled):
-
     pkgcore_config_type = ConfigHint(
         typename="pkgset",
         types={"vdb": "refs:repo", "repos": "refs:repo", "eclasses": "list"},
diff --git a/src/pkgcore/repository/configured.py b/src/pkgcore/repository/configured.py
index 024626a8b..74487d554 100644
--- a/src/pkgcore/repository/configured.py
+++ b/src/pkgcore/repository/configured.py
@@ -14,7 +14,6 @@ from . import prototype
 
 
 class tree(prototype.tree):
-
     configured = True
     operations_kls = operations_proxy
 
diff --git a/src/pkgcore/repository/multiplex.py b/src/pkgcore/repository/multiplex.py
index 5cede2d1f..d4dcf206a 100644
--- a/src/pkgcore/repository/multiplex.py
+++ b/src/pkgcore/repository/multiplex.py
@@ -20,7 +20,6 @@ from . import errors, prototype
 
 
 class operations(repo_interface.operations_proxy):
-
     ops_stop_after_first_supported = frozenset(["install", "uninstall", "replace"])
 
     @klass.cached_property
diff --git a/src/pkgcore/repository/prototype.py b/src/pkgcore/repository/prototype.py
index 65d926147..52221108a 100644
--- a/src/pkgcore/repository/prototype.py
+++ b/src/pkgcore/repository/prototype.py
@@ -17,7 +17,6 @@ from ..restrictions.util import collect_package_restrictions
 
 
 class IterValLazyDict(LazyValDict):
-
     __slots__ = ()
 
     def __str__(self):
@@ -31,7 +30,6 @@ class IterValLazyDict(LazyValDict):
 
 
 class CategoryIterValLazyDict(IterValLazyDict):
-
     __slots__ = ()
 
     def force_add(self, key):
@@ -217,7 +215,6 @@ class tree:
             return False
 
     def has_match(self, atom, **kwds):
-
         kwds.pop("sorter", None)
         kwds.pop("yield_none", None)
 
diff --git a/src/pkgcore/repository/syncable.py b/src/pkgcore/repository/syncable.py
index 8bdc56236..5a6a8b03a 100644
--- a/src/pkgcore/repository/syncable.py
+++ b/src/pkgcore/repository/syncable.py
@@ -4,7 +4,6 @@ from ..operations.repo import sync_operations
 
 
 class tree:
-
     operations_kls = sync_operations
 
     def __init__(self, sync=None):
diff --git a/src/pkgcore/repository/virtual.py b/src/pkgcore/repository/virtual.py
index 42f43fa7a..000eb0e46 100644
--- a/src/pkgcore/repository/virtual.py
+++ b/src/pkgcore/repository/virtual.py
@@ -16,7 +16,6 @@ from . import prototype
 
 
 class tree(prototype.tree):
-
     factory_kls = staticmethod(virtual.factory)
 
     def __init__(self, livefs=False, frozen=False):
@@ -59,7 +58,6 @@ class tree(prototype.tree):
 
 
 class InjectedPkg(pkg_base.wrapper):
-
     __slots__ = (
         "bdepend",
         "depend",
diff --git a/src/pkgcore/resolver/choice_point.py b/src/pkgcore/resolver/choice_point.py
index 02bcf6cba..0d3686ea4 100644
--- a/src/pkgcore/resolver/choice_point.py
+++ b/src/pkgcore/resolver/choice_point.py
@@ -5,7 +5,6 @@ from snakeoil.sequences import iter_stable_unique
 
 
 class choice_point:
-
     __slots__ = (
         "__weakref__",
         "atom",
diff --git a/src/pkgcore/resolver/plan.py b/src/pkgcore/resolver/plan.py
index 548643854..90edb81f1 100644
--- a/src/pkgcore/resolver/plan.py
+++ b/src/pkgcore/resolver/plan.py
@@ -111,7 +111,6 @@ def lowest_iter_sort(l, pkg_grabber=pkg_grabber):
 
 
 class MutableContainmentRestriction(values.base):
-
     __slots__ = ("_blacklist", "match")
 
     def __init__(self, blacklist):
@@ -121,7 +120,6 @@ class MutableContainmentRestriction(values.base):
 
 
 class resolver_frame:
-
     __slots__ = (
         "parent",
         "atom",
@@ -207,7 +205,6 @@ class resolver_frame:
 
 
 class resolver_stack(deque):
-
     frame_klass = resolver_frame
     depth = property(len)
     current_frame = property(operator.itemgetter(-1))
@@ -291,7 +288,6 @@ class resolver_stack(deque):
 
 
 class merge_plan:
-
     vdb_restrict = packages.PackageRestriction(
         "repo.livefs", values.EqualityMatch(True)
     )
@@ -783,7 +779,10 @@ class merge_plan:
 
     def process_dependencies(self, stack, choices, mode, depset, atom):
         failure = []
-        additions, blocks, = (
+        (
+            additions,
+            blocks,
+        ) = (
             [],
             [],
         )
diff --git a/src/pkgcore/resolver/state.py b/src/pkgcore/resolver/state.py
index 991da29d1..a297981ae 100644
--- a/src/pkgcore/resolver/state.py
+++ b/src/pkgcore/resolver/state.py
@@ -105,7 +105,6 @@ class ops_sequence:
 
 
 class base_op_state:
-
     __slots__ = ("pkg", "force", "choices")
     internal = False
 
@@ -137,7 +136,6 @@ class base_op_state:
 
 
 class add_op(base_op_state):
-
     __slots__ = ()
     desc = "add"
 
@@ -154,7 +152,6 @@ class add_op(base_op_state):
 
 
 class add_hardref_op(base_op_state):
-
     __slots__ = ("restriction",)
     desc = "hardref"
     internal = True
@@ -174,7 +171,6 @@ class add_hardref_op(base_op_state):
 
 
 class add_backref_op(base_op_state):
-
     __slots__ = ()
     desc = "backref"
     internal = True
@@ -188,7 +184,6 @@ class add_backref_op(base_op_state):
 
 
 class remove_op(base_op_state):
-
     __slots__ = ()
     desc = "remove"
 
@@ -206,7 +201,6 @@ class remove_op(base_op_state):
 
 
 class replace_op(base_op_state):
-
     __slots__ = ("old_pkg", "old_choices", "force_old")
     desc = "replace"
 
@@ -281,7 +275,6 @@ class replace_op(base_op_state):
 
 
 class blocker_base_op:
-
     __slots__ = ("choices", "blocker", "key")
     desc = None
     internal = True
@@ -319,7 +312,6 @@ class blocker_base_op:
 
 
 class incref_forward_block_op(blocker_base_op):
-
     __slots__ = ()
 
     def apply(self, plan):
@@ -343,7 +335,6 @@ class incref_forward_block_op(blocker_base_op):
 
 
 class decref_forward_block_op(blocker_base_op):
-
     __slots__ = ()
 
     def apply(self, plan):
diff --git a/src/pkgcore/restrictions/packages.py b/src/pkgcore/restrictions/packages.py
index ff6abddde..0375f7465 100644
--- a/src/pkgcore/restrictions/packages.py
+++ b/src/pkgcore/restrictions/packages.py
@@ -146,7 +146,6 @@ class PackageRestriction(restriction.base, metaclass=generic_equality):
 
 
 class PackageRestrictionMulti(PackageRestriction):
-
     __slots__ = ()
     __inst_caching__ = True
     attr = None
@@ -280,7 +279,6 @@ AlwaysBool = restriction.curry_node_type(
 
 
 class KeyedAndRestriction(boolean.AndRestriction):
-
     __inst_caching__ = True
 
     type = restriction.package_type
diff --git a/src/pkgcore/restrictions/values.py b/src/pkgcore/restrictions/values.py
index 8c5ed2286..91863f0e9 100644
--- a/src/pkgcore/restrictions/values.py
+++ b/src/pkgcore/restrictions/values.py
@@ -256,7 +256,6 @@ class StrGlobMatch(base, metaclass=hashed_base):
 
 
 class EqualityMatch(base, metaclass=generic_equality):
-
     __slots__ = ("negate", "data")
     __attr_comparison__ = __slots__
 
@@ -342,7 +341,6 @@ class ContainmentMatch(base, metaclass=hashed_base):
                     return not self.negate
 
     def force_False(self, pkg, attr, val, _values_override=None):
-
         # "More than one statement on a single line"
         # pylint: disable-msg=C0321
 
@@ -414,7 +412,6 @@ class ContainmentMatch(base, metaclass=hashed_base):
         return False
 
     def force_True(self, pkg, attr, val, _values_override=None):
-
         # "More than one statement on a single line"
         # pylint: disable-msg=C0321
 
@@ -601,7 +598,6 @@ class UnicodeConversion(StrConversion):
 
 
 class AnyMatch(restriction.AnyMatch):
-
     __slots__ = ()
 
     __hash__ = object.__hash__
diff --git a/src/pkgcore/scripts/pconfig.py b/src/pkgcore/scripts/pconfig.py
index 2965430b8..00b70a4ef 100644
--- a/src/pkgcore/scripts/pconfig.py
+++ b/src/pkgcore/scripts/pconfig.py
@@ -256,7 +256,6 @@ def dump_main(options, out, err):
 
 def all_configurables():
     class walker(PythonNamespaceWalker):
-
         ignore_all_import_failures = True
 
         def _default_module_blacklister(self, target):
diff --git a/src/pkgcore/scripts/pinspect.py b/src/pkgcore/scripts/pinspect.py
index 49ab89e6b..a3fae9bda 100644
--- a/src/pkgcore/scripts/pinspect.py
+++ b/src/pkgcore/scripts/pinspect.py
@@ -102,7 +102,6 @@ def print_simple_histogram(
 
 
 class histo_data(arghparse.ArgparseCommand):
-
     per_repo_summary = None
     allow_no_detail = False
 
@@ -236,7 +235,6 @@ class histo_data(arghparse.ArgparseCommand):
 
 
 class eapi_usage_kls(histo_data):
-
     per_repo_format = "eapi: %(key)r %(val)s pkgs found, %(percent)s of the repo"
 
     summary_format = "eapi: %(key)r %(val)s pkgs found, %(percent)s of all repos"
@@ -257,7 +255,6 @@ eapi_usage.bind_class(eapi_usage_kls())
 
 
 class license_usage_kls(histo_data):
-
     per_repo_format = "license: %(key)r %(val)s pkgs found, %(percent)s of the repo"
 
     summary_format = "license: %(key)r %(val)s pkgs found, %(percent)s of all repos"
@@ -279,7 +276,6 @@ license_usage.bind_class(license_usage_kls())
 
 
 class eclass_usage_kls(histo_data):
-
     per_repo_format = "eclass: %(key)r %(val)s pkgs found, %(percent)s of the repo"
 
     summary_format = "eclass: %(key)r %(val)s pkgs found, %(percent)s of all repos"
@@ -299,7 +295,6 @@ eclass_usage.bind_class(eclass_usage_kls())
 
 
 class mirror_usage_kls(histo_data):
-
     per_repo_format = "mirror: %(key)r %(val)s pkgs found, %(percent)s of the repo"
 
     summary_format = "mirror: %(key)r %(val)s pkgs found, %(percent)s of all repos"
@@ -325,7 +320,6 @@ mirror_usage.bind_class(mirror_usage_kls())
 
 
 class distfiles_usage_kls(histo_data):
-
     per_repo_format = (
         "package: %(key)r %(val)s bytes, referencing %(percent)s of the unique total"
     )
diff --git a/src/pkgcore/sync/base.py b/src/pkgcore/sync/base.py
index 2d60e6c00..e9099e916 100644
--- a/src/pkgcore/sync/base.py
+++ b/src/pkgcore/sync/base.py
@@ -59,7 +59,6 @@ class MissingBinary(SyncError):
 
 
 class Syncer:
-
     forcable = False
 
     supported_uris = ()
@@ -288,7 +287,6 @@ def GenericSyncer(basedir, uri, **kwargs):
 
 
 class DisabledSyncer(Syncer):
-
     disabled = True
 
     def __init__(self, path, *args, **kwargs):
diff --git a/src/pkgcore/sync/bzr.py b/src/pkgcore/sync/bzr.py
index 02fa3ecd1..c92c35d0e 100644
--- a/src/pkgcore/sync/bzr.py
+++ b/src/pkgcore/sync/bzr.py
@@ -8,7 +8,6 @@ from . import base
 
 
 class bzr_syncer(base.VcsSyncer):
-
     binary = "bzr"
 
     supported_uris = (("bzr+", 5),)
diff --git a/src/pkgcore/sync/cvs.py b/src/pkgcore/sync/cvs.py
index c6f3513aa..62cc3a981 100644
--- a/src/pkgcore/sync/cvs.py
+++ b/src/pkgcore/sync/cvs.py
@@ -6,7 +6,6 @@ from . import base
 
 
 class cvs_syncer(base.VcsSyncer):
-
     binary = "cvs"
 
     supported_uris = (
diff --git a/src/pkgcore/sync/darcs.py b/src/pkgcore/sync/darcs.py
index 8ef108fe6..11ade9f71 100644
--- a/src/pkgcore/sync/darcs.py
+++ b/src/pkgcore/sync/darcs.py
@@ -4,7 +4,6 @@ from . import base
 
 
 class darcs_syncer(base.VcsSyncer):
-
     binary = "darcs"
 
     supported_uris = (("darcs+", 5),)
diff --git a/src/pkgcore/sync/git.py b/src/pkgcore/sync/git.py
index c2bfa34bd..48d6b3518 100644
--- a/src/pkgcore/sync/git.py
+++ b/src/pkgcore/sync/git.py
@@ -6,7 +6,6 @@ from . import base
 
 
 class git_syncer(base.VcsSyncer):
-
     binary = "git"
 
     supported_uris = (
diff --git a/src/pkgcore/sync/git_svn.py b/src/pkgcore/sync/git_svn.py
index 3a34c03e4..3726397f1 100644
--- a/src/pkgcore/sync/git_svn.py
+++ b/src/pkgcore/sync/git_svn.py
@@ -8,7 +8,6 @@ from . import base
 
 
 class git_svn_syncer(base.VcsSyncer):
-
     binary = "git"
 
     supported_uris = (
diff --git a/src/pkgcore/sync/hg.py b/src/pkgcore/sync/hg.py
index 1c698ded7..1d2e10337 100644
--- a/src/pkgcore/sync/hg.py
+++ b/src/pkgcore/sync/hg.py
@@ -6,7 +6,6 @@ from . import base
 
 
 class hg_syncer(base.VcsSyncer):
-
     binary = "hg"
 
     supported_uris = (
diff --git a/src/pkgcore/sync/rsync.py b/src/pkgcore/sync/rsync.py
index bde2fd653..4869ac6a8 100644
--- a/src/pkgcore/sync/rsync.py
+++ b/src/pkgcore/sync/rsync.py
@@ -16,7 +16,6 @@ from . import base
 
 
 class rsync_syncer(base.ExternalSyncer):
-
     default_excludes = ["/distfiles", "/local", "/packages"]
     default_includes = []
     default_conn_timeout = 15
@@ -174,7 +173,6 @@ class _RsyncFileSyncer(rsync_syncer):
 
 
 class rsync_timestamp_syncer(rsync_syncer):
-
     forcable = True
     forward_sync_delay = 25 * 60  # 25 minutes
     negative_sync_delay = 60 * 60  # 60 minutes
diff --git a/src/pkgcore/sync/sqfs.py b/src/pkgcore/sync/sqfs.py
index 1e4ff41e0..c51dbd4a5 100644
--- a/src/pkgcore/sync/sqfs.py
+++ b/src/pkgcore/sync/sqfs.py
@@ -5,7 +5,6 @@ from .http import http_syncer
 
 
 class sqfs_syncer(http_syncer):
-
     supported_uris = (
         ("sqfs+http://", 5),
         ("sqfs+https://", 5),
diff --git a/src/pkgcore/sync/svn.py b/src/pkgcore/sync/svn.py
index 6b9e29a52..466d66a71 100644
--- a/src/pkgcore/sync/svn.py
+++ b/src/pkgcore/sync/svn.py
@@ -8,7 +8,6 @@ from . import base
 
 
 class svn_syncer(base.ExternalSyncer):
-
     binary = "svn"
 
     supported_uris = (
diff --git a/src/pkgcore/sync/tar.py b/src/pkgcore/sync/tar.py
index a1ecdd27a..6ff22e384 100644
--- a/src/pkgcore/sync/tar.py
+++ b/src/pkgcore/sync/tar.py
@@ -12,7 +12,6 @@ from .http import http_syncer
 
 
 class tar_syncer(http_syncer, base.ExternalSyncer):
-
     binary = "tar"
 
     supported_uris = (
diff --git a/src/pkgcore/system/libtool.py b/src/pkgcore/system/libtool.py
index 241d4414b..35daf78c0 100644
--- a/src/pkgcore/system/libtool.py
+++ b/src/pkgcore/system/libtool.py
@@ -124,7 +124,6 @@ def fix_fsobject(location):
 
 
 class FixLibtoolArchivesTrigger(triggers.base):
-
     required_csets = ("install",)
     _engine_types = triggers.INSTALLING_MODES
     _hooks = ("pre_merge",)
diff --git a/src/pkgcore/test/misc.py b/src/pkgcore/test/misc.py
index 43cc257c1..20c8e6fe3 100644
--- a/src/pkgcore/test/misc.py
+++ b/src/pkgcore/test/misc.py
@@ -19,7 +19,6 @@ Options = AttrAccessible
 
 
 class FakePkgBase(package):
-
     __slots__ = ()
 
     def __init__(self, cpvstr, data=None, shared=None, repo=None):
diff --git a/src/pkgcore/util/commandline.py b/src/pkgcore/util/commandline.py
index 52503f371..c7df89c97 100644
--- a/src/pkgcore/util/commandline.py
+++ b/src/pkgcore/util/commandline.py
@@ -134,7 +134,6 @@ class NoDefaultConfigError(argparse.ArgumentError):
 
 
 class StoreConfigObject(argparse._StoreAction):
-
     default_priority = 20
 
     def __init__(self, *args, **kwargs):
diff --git a/src/pkgcore/vdb/contents.py b/src/pkgcore/vdb/contents.py
index 4590d1999..2697c0fbd 100644
--- a/src/pkgcore/vdb/contents.py
+++ b/src/pkgcore/vdb/contents.py
@@ -13,7 +13,6 @@ from ..fs.contents import contentsSet
 
 
 class LookupFsDev(fs.fsDev):
-
     __slots__ = ()
 
     def __init__(self, path, **kwds):
@@ -38,7 +37,6 @@ class ContentsFile(contentsSet):
     """class wrapping a contents file"""
 
     def __init__(self, source, mutable=False, create=False):
-
         if not isinstance(source, (data_source.base, str)):
             raise TypeError("source must be either data_source, or a filepath")
         super().__init__(mutable=True)
@@ -130,7 +128,6 @@ class ContentsFile(contentsSet):
             outfile = self._get_fd(True)
 
             for obj in sorted(self):
-
                 if obj.is_reg:
                     s = " ".join(
                         (
diff --git a/tests/cache/test_base.py b/tests/cache/test_base.py
index a613bebb6..dc6b1fa04 100644
--- a/tests/cache/test_base.py
+++ b/tests/cache/test_base.py
@@ -52,7 +52,6 @@ class DictCache(base):
 
 
 class DictCacheBulk(bulk):
-
     cleanse_keys = True
     __has_working_commit__ = True
 
@@ -82,7 +81,6 @@ class DictCacheBulk(bulk):
 
 
 class TestBase:
-
     cache_keys = ("foo", "_eclasses_")
 
     def get_db(self, readonly=False):
diff --git a/tests/config/test_basics.py b/tests/config/test_basics.py
index 7dfc88dbf..e04cc7047 100644
--- a/tests/config/test_basics.py
+++ b/tests/config/test_basics.py
@@ -409,7 +409,6 @@ class TestConvertString:
 
 
 class TestConvertAsIs:
-
     source = {
         "str": "tests",
         "bool": True,
diff --git a/tests/ebuild/test_conditionals.py b/tests/ebuild/test_conditionals.py
index a0101dc33..cce9efdd8 100644
--- a/tests/ebuild/test_conditionals.py
+++ b/tests/ebuild/test_conditionals.py
@@ -343,7 +343,6 @@ class TestDepSetEvaluate(base):
                 "",
             ),
         ):
-
             result = vals[0]
             src = vals[1]
             use, tristate, kls = [], None, str
diff --git a/tests/ebuild/test_cpv.py b/tests/ebuild/test_cpv.py
index e33fe20bf..e014d751d 100644
--- a/tests/ebuild/test_cpv.py
+++ b/tests/ebuild/test_cpv.py
@@ -19,7 +19,6 @@ def generate_misc_sufs():
 
 
 class TestCPV:
-
     good_cats = (
         "dev-util",
         "dev+",
diff --git a/tests/ebuild/test_digest.py b/tests/ebuild/test_digest.py
index be4985b24..4bb9ae1e4 100644
--- a/tests/ebuild/test_digest.py
+++ b/tests/ebuild/test_digest.py
@@ -50,7 +50,6 @@ for x in pure_manifest2.split("\n"):
 
 
 class TestManifest:
-
     convert_source = staticmethod(lambda x: x)
 
     def get_manifest(self, data):
diff --git a/tests/ebuild/test_ebuild_src.py b/tests/ebuild/test_ebuild_src.py
index 9d07d55f4..f34c9c946 100644
--- a/tests/ebuild/test_ebuild_src.py
+++ b/tests/ebuild/test_ebuild_src.py
@@ -16,7 +16,6 @@ from .test_eclass_cache import FakeEclassCache
 
 
 class TestBase:
-
     kls = ebuild_src.base
 
     def get_pkg(
@@ -577,7 +576,6 @@ class TestBase:
 
 
 class TestPackage(TestBase):
-
     kls = ebuild_src.package
 
     def get_pkg(self, *args, **kwds):
@@ -619,7 +617,6 @@ class TestPackage(TestBase):
 
 
 class TestPackageFactory:
-
     kls = ebuild_src.package_factory
 
     def mkinst(
diff --git a/tests/ebuild/test_formatter.py b/tests/ebuild/test_formatter.py
index 4f5cf424a..170fb8caf 100644
--- a/tests/ebuild/test_formatter.py
+++ b/tests/ebuild/test_formatter.py
@@ -72,7 +72,6 @@ class BaseFormatterTest:
         return kls(**kwargs)
 
     def assertOut(self, *args, **kwargs):
-
         strings = []
         objects = []
 
@@ -121,7 +120,6 @@ class BaseFormatterTest:
 
 
 class TestBasicFormatter(BaseFormatterTest):
-
     formatterClass = BasicFormatter
 
     def test_install(self):
@@ -140,7 +138,6 @@ class TestBasicFormatter(BaseFormatterTest):
 
 
 class TestPkgcoreFormatter(BaseFormatterTest):
-
     formatterClass = PkgcoreFormatter
 
     def test_install(self):
@@ -187,7 +184,6 @@ class TestPkgcoreFormatter(BaseFormatterTest):
 
 
 class CountingFormatterTest(BaseFormatterTest):
-
     endprefix = ""
     endsuffix = "\n"
 
@@ -350,7 +346,6 @@ class CountingFormatterTest(BaseFormatterTest):
 
 
 class TestPortageFormatter(BaseFormatterTest):
-
     formatterClass = PortageFormatter
 
     def setup_method(self):
diff --git a/tests/ebuild/test_misc.py b/tests/ebuild/test_misc.py
index 978208902..056271cde 100644
--- a/tests/ebuild/test_misc.py
+++ b/tests/ebuild/test_misc.py
@@ -7,7 +7,6 @@ AlwaysFalse = packages.AlwaysFalse
 
 
 class Test_collapsed_restrict_to_data:
-
     kls = misc.collapsed_restrict_to_data
 
     def assert_state(self, obj, defaults=(), freeform=(), atoms=()):
diff --git a/tests/ebuild/test_profiles.py b/tests/ebuild/test_profiles.py
index 7957c7c53..31549d5de 100644
--- a/tests/ebuild/test_profiles.py
+++ b/tests/ebuild/test_profiles.py
@@ -92,7 +92,6 @@ empty = ((), ())
 
 
 class TestPmsProfileNode(profile_mixin):
-
     klass = staticmethod(ProfileNode)
     profile = "default"
 
@@ -770,7 +769,6 @@ class TestPmsProfileNode(profile_mixin):
 
 
 class TestPortage1ProfileNode(TestPmsProfileNode):
-
     can_be_dirs = frozenset(
         [
             "package.accept_keywords",
@@ -818,7 +816,6 @@ class TestPortage1ProfileNode(TestPmsProfileNode):
 
 
 class TestPortage2ProfileNode(TestPortage1ProfileNode):
-
     profile = os.path.join("profiles", "default")
 
     def setup_repo(self, tmp_path):
@@ -832,7 +829,6 @@ class TestPortage2ProfileNode(TestPortage1ProfileNode):
 
 
 class TestProfileBashrcProfileNode(TestPmsProfileNode):
-
     profile = os.path.join("profiles", "default")
 
     def assert_pkg_bashrc(self, actual, expected):
@@ -895,7 +891,6 @@ class TestProfileBashrcProfileNode(TestPmsProfileNode):
 
 
 class TestProfileSetProfileNode(TestPmsProfileNode):
-
     profile = os.path.join("profiles", "default")
 
     def setup_repo(self, tmp_path):
@@ -914,7 +909,6 @@ class TestProfileSetProfileNode(TestPmsProfileNode):
 
 
 class TestOnDiskProfile(profile_mixin):
-
     # use a derivative, using the inst caching disabled ProfileNode kls
     # from above
     class kls(profiles.OnDiskProfile):
diff --git a/tests/fetch/test_init.py b/tests/fetch/test_init.py
index cf9cbbafc..9c5d21e37 100644
--- a/tests/fetch/test_init.py
+++ b/tests/fetch/test_init.py
@@ -30,7 +30,6 @@ class TestFetchable:
 
 
 class TestMirror:
-
     kls = fetch.mirror
     default_mirrors = ["http://foon", "ftp://spoon"]
 
@@ -59,7 +58,6 @@ class TestMirror:
 
 
 class TestDefaultMirror(TestMirror):
-
     kls = fetch.default_mirror
 
 
diff --git a/tests/fs/test_contents.py b/tests/fs/test_contents.py
index e039314de..5896d7974 100644
--- a/tests/fs/test_contents.py
+++ b/tests/fs/test_contents.py
@@ -363,7 +363,6 @@ class TestContentsSet:
 
 
 class Test_offset_rewriting:
-
     change_offset = staticmethod(contents.change_offset_rewriter)
     offset_insert = staticmethod(contents.offset_rewriter)
 
diff --git a/tests/fs/test_fs.py b/tests/fs/test_fs.py
index 605be48ff..30f844f65 100644
--- a/tests/fs/test_fs.py
+++ b/tests/fs/test_fs.py
@@ -7,7 +7,6 @@ from snakeoil.osutils import normpath, pjoin
 
 
 class base:
-
     kls = None
 
     def make_obj(self, location="/tmp/foo", **kwds):
@@ -98,7 +97,6 @@ class base:
 
 
 class Test_fsFile(base):
-
     kls = fs.fsFile
 
     def test_init(self):
diff --git a/tests/fs/test_ops.py b/tests/fs/test_ops.py
index 578ddf5c3..fcc058160 100644
--- a/tests/fs/test_ops.py
+++ b/tests/fs/test_ops.py
@@ -117,7 +117,6 @@ class TestCopyFile:
 
 
 class ContentsMixin:
-
     entries_norm1 = {
         "file1": ["reg"],
         "dir": ["dir"],
diff --git a/tests/merge/test_engine.py b/tests/merge/test_engine.py
index 35421a4c8..f4650860c 100644
--- a/tests/merge/test_engine.py
+++ b/tests/merge/test_engine.py
@@ -18,7 +18,6 @@ class fake_pkg:
 
 
 class TestMergeEngineCsets:
-
     simple_cset = list(fsFile(x) for x in ("/foon", "/usr/dar", "/blah"))
     simple_cset.extend(fsDir(x) for x in ("/usr", "/usr/lib"))
     simple_cset.append(fsSymlink("/usr/lib/blah", "../../blah"))
diff --git a/tests/merge/test_triggers.py b/tests/merge/test_triggers.py
index 454eeb5b8..08d0402d7 100644
--- a/tests/merge/test_triggers.py
+++ b/tests/merge/test_triggers.py
@@ -28,7 +28,6 @@ def make_fake_reporter(**kwargs):
 
 
 class TestBase:
-
     kls = fake_trigger
 
     def mk_trigger(self, kls=None, **kwargs):
@@ -128,7 +127,6 @@ def test_module_constants():
 
 
 class Test_mtime_watcher:
-
     kls = triggers.mtime_watcher
 
     def test_identification(self, tmp_path):
@@ -212,7 +210,6 @@ class Test_mtime_watcher:
 
 def castrate_trigger(base_kls, **kwargs):
     class castrated_trigger(base_kls):
-
         enable_regen = False
 
         def __init__(self, *args2, **kwargs2):
@@ -245,7 +242,6 @@ class trigger_mixin:
     not sys.platform.startswith("linux"), reason="supported on Linux only"
 )
 class Test_ldconfig(trigger_mixin):
-
     # use the kls indirection for when *bsd version of ldconfig trigger
     # is derived; will be pretty much the same, sans the trigger call.
 
@@ -316,7 +312,6 @@ class Test_ldconfig(trigger_mixin):
 
 
 class TestInfoRegen(trigger_mixin):
-
     raw_kls = triggers.InfoRegen
 
     @property
@@ -385,7 +380,6 @@ class TestInfoRegen(trigger_mixin):
         reason="can't verify regen behavior due to install-info not being available",
     )
     def test_trigger(self, tmp_path):
-
         with os_environ("PATH"):
             self.engine.phase = "post_merge"
             assert self.trigger(self.engine, {}) is None
@@ -438,7 +432,6 @@ class TestInfoRegen(trigger_mixin):
 
 
 class single_attr_change_base:
-
     kls = triggers.fix_uid_perms
     attr = None
 
@@ -498,19 +491,16 @@ class single_attr_change_base:
 
 
 class Test_fix_uid_perms(single_attr_change_base):
-
     kls = triggers.fix_uid_perms
     attr = "uid"
 
 
 class Test_fix_gid_perms(single_attr_change_base):
-
     kls = triggers.fix_gid_perms
     attr = "gid"
 
 
 class Test_fix_set_bits(single_attr_change_base):
-
     kls = triggers.fix_set_bits
     trigger = property(lambda self: self.kls())
     attr = "mode"
@@ -523,7 +513,6 @@ class Test_fix_set_bits(single_attr_change_base):
 
 
 class Test_detect_world_writable(single_attr_change_base):
-
     kls = triggers.detect_world_writable
     _trigger_override = None
 
@@ -585,7 +574,6 @@ class Test_detect_world_writable(single_attr_change_base):
 
 
 class TestPruneFiles:
-
     kls = triggers.PruneFiles
 
     def test_metadata(self):
diff --git a/tests/package/test_base.py b/tests/package/test_base.py
index 7c2b987f2..f189c8a29 100644
--- a/tests/package/test_base.py
+++ b/tests/package/test_base.py
@@ -29,7 +29,6 @@ class mixin:
 
 
 class TestBasePkg(mixin):
-
     mk_inst = kls = staticmethod(base.base)
 
     def test_properties(self):
@@ -57,7 +56,6 @@ class TestBasePkg(mixin):
 
 
 class TestWrapper(mixin):
-
     kls = base.wrapper
 
     def mk_inst(self, overrides=None, **kwds):
diff --git a/tests/package/test_metadata.py b/tests/package/test_metadata.py
index 90e3857fc..22e1ddd3b 100644
--- a/tests/package/test_metadata.py
+++ b/tests/package/test_metadata.py
@@ -20,7 +20,6 @@ def make_pkg_kls(attrs=(), callbacks={}):
         __setattr__ = object.__setattr__
 
     class metadata_pkg(metadata.DeriveMetadataKls(simple_pkg)):
-
         __slots__ = ()
 
         def _fetch_metadata(self):
diff --git a/tests/package/test_mutated.py b/tests/package/test_mutated.py
index 7d845f661..32c0a3fdc 100644
--- a/tests/package/test_mutated.py
+++ b/tests/package/test_mutated.py
@@ -12,7 +12,6 @@ def passthru(val, self):
 
 
 class FakePkg(base):
-
     # XXX why isn't this using existing classes?
     __slotting_intentionally_disabled__ = True
 
diff --git a/tests/pkgsets/test_filelist.py b/tests/pkgsets/test_filelist.py
index 74158c2e4..e3a000579 100644
--- a/tests/pkgsets/test_filelist.py
+++ b/tests/pkgsets/test_filelist.py
@@ -7,7 +7,6 @@ from pkgcore.pkgsets import filelist
 
 
 class TestFileList:
-
     kls = staticmethod(filelist.FileList)
 
     @property
@@ -73,7 +72,6 @@ class TestFileList:
 
 
 class TestWorldFile(TestFileList):
-
     kls = staticmethod(filelist.WorldFile)
 
     def test_add(self, tmp_path):
diff --git a/tests/pkgsets/test_installed.py b/tests/pkgsets/test_installed.py
index 8b4f7ec5c..990388ab0 100644
--- a/tests/pkgsets/test_installed.py
+++ b/tests/pkgsets/test_installed.py
@@ -3,7 +3,6 @@ from pkgcore.repository.util import SimpleTree
 
 
 class FakePkg:
-
     package_is_real = True
     is_supported = True
 
diff --git a/tests/repository/test_multiplex.py b/tests/repository/test_multiplex.py
index 155e2d227..5977241dd 100644
--- a/tests/repository/test_multiplex.py
+++ b/tests/repository/test_multiplex.py
@@ -9,7 +9,6 @@ rev_sorted = partial(sorted, reverse=True)
 
 
 class TestMultiplex:
-
     kls = staticmethod(tree)
     tree1_pkgs = (
         ("dev-util/diffball", ["1.0", "0.7"]),
diff --git a/tests/resolver/test_pigeonholes.py b/tests/resolver/test_pigeonholes.py
index 80123f157..c847c0f44 100644
--- a/tests/resolver/test_pigeonholes.py
+++ b/tests/resolver/test_pigeonholes.py
@@ -6,7 +6,6 @@ from .test_choice_point import fake_package
 
 
 class fake_blocker(restriction.base):
-
     __slots__ = ("key", "blocks")
 
     def __init__(self, key, blocks=()):
diff --git a/tests/restrictions/test_boolean.py b/tests/restrictions/test_boolean.py
index 2fd3e0043..bb83e713b 100644
--- a/tests/restrictions/test_boolean.py
+++ b/tests/restrictions/test_boolean.py
@@ -7,7 +7,6 @@ false = restriction.AlwaysBool(node_type="foo", negate=False)
 
 
 class AlwaysForcableBool(boolean.base):
-
     __slots__ = ()
 
     def force_True(self, action, *args):
@@ -17,7 +16,6 @@ class AlwaysForcableBool(boolean.base):
 
 
 class base:
-
     kls = None
 
     def test_invalid_restrictions(self):
@@ -70,7 +68,6 @@ class base:
 
 
 class TestBase(base):
-
     kls = boolean.base
 
     def test_base(self):
@@ -89,7 +86,6 @@ class TestBase(base):
 
 # TODO these tests are way too limited
 class TestAndRestriction(base):
-
     kls = boolean.AndRestriction
 
     def test_match(self):
@@ -132,7 +128,6 @@ class TestAndRestriction(base):
 
 
 class TestOrRestriction(base):
-
     kls = boolean.OrRestriction
 
     def test_match(self):
@@ -188,7 +183,6 @@ class TestOrRestriction(base):
 
 
 class TestJustOneRestriction(base):
-
     kls = boolean.JustOneRestriction
 
     def test_match(self):
diff --git a/tests/restrictions/test_delegated.py b/tests/restrictions/test_delegated.py
index 4ffdd1abf..10eff7070 100644
--- a/tests/restrictions/test_delegated.py
+++ b/tests/restrictions/test_delegated.py
@@ -5,7 +5,6 @@ from .utils import TestRestriction
 
 
 class Test_delegate(TestRestriction):
-
     kls = delegate
 
     def test_it(self):
diff --git a/tests/restrictions/test_packages.py b/tests/restrictions/test_packages.py
index e5d4df07c..4288b3e6f 100644
--- a/tests/restrictions/test_packages.py
+++ b/tests/restrictions/test_packages.py
@@ -15,7 +15,6 @@ class AlwaysSelfIntersect(values.base):
 
 
 class TestPackageRestriction(TestRestriction):
-
     if packages.PackageRestriction is packages.PackageRestriction:
         kls = packages.PackageRestriction
     else:
@@ -101,7 +100,6 @@ class TestPackageRestriction(TestRestriction):
 
 
 class values_callback(values.base):
-
     __slots__ = ("callback",)
 
     def __init__(self, callback):
@@ -118,7 +116,6 @@ class values_callback(values.base):
 
 
 class TestPackageRestrictionMulti:
-
     if packages.PackageRestriction is packages.PackageRestriction:
         kls = packages.PackageRestrictionMulti
     else:
diff --git a/tests/restrictions/test_restriction.py b/tests/restrictions/test_restriction.py
index 893c722a4..b1f8a5d89 100644
--- a/tests/restrictions/test_restriction.py
+++ b/tests/restrictions/test_restriction.py
@@ -20,7 +20,6 @@ class SillyBool(restriction.base):
 
 
 class TestBase(TestRestriction):
-
     bool_kls = SillyBool
 
     def test_base(self):
@@ -48,7 +47,6 @@ class TestBase(TestRestriction):
 
 
 class TestAlwaysBool(TestRestriction):
-
     bool_kls = partial(restriction.AlwaysBool, "foo")
 
     def test_true(self):
diff --git a/tests/restrictions/test_values.py b/tests/restrictions/test_values.py
index a971e69d4..4365fda0a 100644
--- a/tests/restrictions/test_values.py
+++ b/tests/restrictions/test_values.py
@@ -56,7 +56,6 @@ class TestGetAttr(TestRestriction):
 
 
 class TestStrRegex(TestRestriction):
-
     kls = values.StrRegex
 
     @pytest.mark.parametrize("negated", (True, False))
@@ -109,7 +108,6 @@ class TestStrRegex(TestRestriction):
 
 
 class TestStrExactMatch(TestRestriction):
-
     if values.StrExactMatch is values.StrExactMatch:
         kls = values.StrExactMatch
     else:
@@ -183,7 +181,6 @@ class TestStrExactMatch(TestRestriction):
 
 
 class TestStrGlobMatch(TestRestriction):
-
     kls = values.StrGlobMatch
 
     @pytest.mark.parametrize("negated", (True, False))
@@ -269,7 +266,6 @@ class TestStrGlobMatch(TestRestriction):
 
 
 class TestEqualityMatch(TestRestriction):
-
     kls = staticmethod(values.EqualityMatch)
 
     @pytest.mark.parametrize("negated", (True, False))
@@ -311,7 +307,6 @@ class TestEqualityMatch(TestRestriction):
 
 
 class TestContainmentMatch(TestRestriction):
-
     kls = partial(values.ContainmentMatch, disable_inst_caching=True)
 
     def test_match(self):
@@ -321,7 +316,6 @@ class TestContainmentMatch(TestRestriction):
             (list(range(10)), set(range(10)), True),
             (set(range(10)), list(range(10)), True),
         ):
-
             for negated in (False, True):
                 self.assertMatches(
                     self.kls(x, negate=negated, disable_inst_caching=True),
@@ -401,7 +395,6 @@ class TestFunctionRestriction:
 
 
 class TestAnyMatch:
-
     # Most of AnyMatch is tested through test_restriction.
 
     def test_force(self):
diff --git a/tests/scripts/test_patom.py b/tests/scripts/test_patom.py
index 499030de0..5c0dbcd33 100644
--- a/tests/scripts/test_patom.py
+++ b/tests/scripts/test_patom.py
@@ -5,7 +5,6 @@ from pkgcore.test.scripts.helpers import ArgParseMixin
 
 
 class TestFormat(ArgParseMixin):
-
     _argparser = patom.argparser
 
     def test_empty(self):
diff --git a/tests/scripts/test_pclean.py b/tests/scripts/test_pclean.py
index 2b13eb01c..4ffcbb514 100644
--- a/tests/scripts/test_pclean.py
+++ b/tests/scripts/test_pclean.py
@@ -3,7 +3,6 @@ from pkgcore.test.scripts.helpers import ArgParseMixin
 
 
 class TestCommandline(ArgParseMixin):
-
     _argparser = pclean.argparser
 
     suppress_domain = True
diff --git a/tests/scripts/test_pclonecache.py b/tests/scripts/test_pclonecache.py
index 0509a8f8a..5689f662c 100644
--- a/tests/scripts/test_pclonecache.py
+++ b/tests/scripts/test_pclonecache.py
@@ -5,7 +5,6 @@ from pkgcore.test.scripts.helpers import ArgParseMixin
 
 
 class Cache:
-
     pkgcore_config_type = ConfigHint(typename="cache")
 
     def __init__(self, readonly=True):
@@ -13,7 +12,6 @@ class Cache:
 
 
 class TestCommandline(ArgParseMixin):
-
     _argparser = pclonecache.argparser
 
     def test_parser(self):
diff --git a/tests/scripts/test_pconfig.py b/tests/scripts/test_pconfig.py
index e11b502db..c9cd40eb2 100644
--- a/tests/scripts/test_pconfig.py
+++ b/tests/scripts/test_pconfig.py
@@ -50,7 +50,6 @@ def increment(inc=()):
 
 
 class DescribeClassTest(ArgParseMixin):
-
     _argparser = pconfig.describe_class
 
     def test_parser(self, capsys):
@@ -95,7 +94,6 @@ class DescribeClassTest(ArgParseMixin):
 
 
 class TestClasses(ArgParseMixin):
-
     _argparser = pconfig.classes
 
     def test_classes(self):
@@ -147,7 +145,6 @@ class TestClasses(ArgParseMixin):
 
 
 class TestDump(ArgParseMixin):
-
     _argparser = pconfig.dump
 
     def test_dump(self):
@@ -261,7 +258,6 @@ class TestDump(ArgParseMixin):
 
 
 class TestUncollapsable(ArgParseMixin):
-
     _argparser = pconfig.uncollapsable
 
     def test_uncollapsable(self):
@@ -282,7 +278,6 @@ class TestUncollapsable(ArgParseMixin):
 
 
 class TestConfigurables(ArgParseMixin):
-
     _argparser = pconfig.configurables
 
     def test_configurables(self):
@@ -309,7 +304,6 @@ class WeirdSection(basics.ConfigSection):
 
 
 class TestDumpUncollapsed(ArgParseMixin):
-
     _argparser = pconfig.dump_uncollapsed
 
     def test_dump_uncollapsed(self):
diff --git a/tests/scripts/test_pebuild.py b/tests/scripts/test_pebuild.py
index 6a99c4cae..8cc0ce47a 100644
--- a/tests/scripts/test_pebuild.py
+++ b/tests/scripts/test_pebuild.py
@@ -6,7 +6,6 @@ from pkgcore.test.scripts.helpers import ArgParseMixin
 
 
 class FakeDomain:
-
     pkgcore_config_type = ConfigHint(types={"repo": "ref:repo"}, typename="domain")
 
     def __init__(self, repo):
@@ -37,7 +36,6 @@ domain_config = basics.HardCodedConfigSection(
 
 
 class TestCommandline(ArgParseMixin):
-
     _argparser = pebuild.argparser
 
     def test_parser(self):
diff --git a/tests/scripts/test_pmaint.py b/tests/scripts/test_pmaint.py
index 417b7a106..945ef0dd3 100644
--- a/tests/scripts/test_pmaint.py
+++ b/tests/scripts/test_pmaint.py
@@ -33,7 +33,6 @@ class fake_operations(operations):
 
 
 class FakeRepo(util.SimpleTree):
-
     operations_kls = fake_operations
 
     def __init__(self, data, frozen=False, livefs=False, repo_id=None):
@@ -54,7 +53,6 @@ def make_repo_config(repo_data, livefs=False, frozen=False, repo_id=None):
 
 
 class FakeDomain:
-
     pkgcore_config_type = ConfigHint(
         types={"repos": "refs:repo", "binpkg": "refs:repo", "vdb": "refs:repo"},
         typename="domain",
@@ -103,7 +101,6 @@ class FakeSyncer(base.Syncer):
 
 
 class SyncableRepo(syncable.tree, util.SimpleTree):
-
     pkgcore_config_type = ConfigHint(typename="repo_config")
 
     def __init__(self, succeed=True):
@@ -121,7 +118,6 @@ failure_section = basics.HardCodedConfigSection(
 
 
 class TestSync(ArgParseMixin):
-
     _argparser = pmaint.sync
 
     def test_parser(self):
@@ -188,7 +184,6 @@ def derive_op(name, op, *a, **kw):
 
 
 class TestCopy(ArgParseMixin):
-
     _argparser = pmaint.copy
 
     def execute_main(self, *a, **kw):
@@ -267,11 +262,9 @@ class TestCopy(ArgParseMixin):
 
 
 class TestRegen(ArgParseMixin):
-
     _argparser = pmaint.regen
 
     def test_parser(self):
-
         options = self.parse("fake", "--threads", "2", domain=make_domain())
         assert isinstance(options.repos[0], util.SimpleTree)
         assert options.threads == 2
diff --git a/tests/scripts/test_pplugincache.py b/tests/scripts/test_pplugincache.py
index 15f8b2c9e..880a5eaab 100644
--- a/tests/scripts/test_pplugincache.py
+++ b/tests/scripts/test_pplugincache.py
@@ -4,7 +4,6 @@ from pkgcore.test.scripts.helpers import ArgParseMixin
 
 
 class TestCommandline(ArgParseMixin):
-
     _argparser = pplugincache.argparser
 
     has_config = False
diff --git a/tests/scripts/test_pquery.py b/tests/scripts/test_pquery.py
index 72b31d242..c2e7dc992 100644
--- a/tests/scripts/test_pquery.py
+++ b/tests/scripts/test_pquery.py
@@ -7,7 +7,6 @@ from pkgcore.test.scripts.helpers import ArgParseMixin
 
 
 class FakeDomain:
-
     pkgcore_config_type = ConfigHint(
         types={"repos": "refs:repo", "vdb": "refs:repo"}, typename="domain"
     )
@@ -39,7 +38,6 @@ domain_config = basics.HardCodedConfigSection(
 
 
 class TestCommandline(ArgParseMixin):
-
     _argparser = pquery.argparser
 
     def test_parser(self):
diff --git a/tests/sync/test_rsync.py b/tests/sync/test_rsync.py
index 8bfba18f0..b6f73f3ca 100644
--- a/tests/sync/test_rsync.py
+++ b/tests/sync/test_rsync.py
@@ -16,7 +16,6 @@ def fake_ips(num):
 @mock.patch("socket.getaddrinfo", return_value=fake_ips(3))
 @mock.patch("snakeoil.process.spawn.spawn")
 class TestRsyncSyncer:
-
     _syncer_class = rsync.rsync_syncer
 
     @pytest.fixture(autouse=True)
@@ -89,7 +88,6 @@ class TestRsyncSyncer:
 
 
 class TestRsyncTimestampSyncer(TestRsyncSyncer):
-
     _syncer_class = rsync.rsync_timestamp_syncer
 
 
diff --git a/tests/test_eq_hash_inheritance.py b/tests/test_eq_hash_inheritance.py
index 86b3c558a..229e0bc42 100644
--- a/tests/test_eq_hash_inheritance.py
+++ b/tests/test_eq_hash_inheritance.py
@@ -2,6 +2,5 @@ from snakeoil.test.eq_hash_inheritance import Test
 
 
 class Test_Eq_Hash(Test):
-
     target_namespace = "pkgcore"
     ignore_all_import_failures = True
diff --git a/tests/test_slot_shadowing.py b/tests/test_slot_shadowing.py
index fa47e291c..9702f96cc 100644
--- a/tests/test_slot_shadowing.py
+++ b/tests/test_slot_shadowing.py
@@ -2,7 +2,6 @@ from snakeoil.test.slot_shadowing import SlotShadowing
 
 
 class Test_slot_shadowing(SlotShadowing):
-
     target_namespace = "pkgcore"
     ignore_all_import_failures = True