commit: 2ccc411e5cc82744f529c407bf01bd1e71474ffc
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 19 17:35:46 2025 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 19 17:35:46 2025 +0000
URL:
https://gitweb.gentoo.org/proj/pkgcore/pkgcore.git/commit/?id=2ccc411e
rename snakeoil.klass.{generic_equality -> GenericEquality}
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
src/pkgcore/ebuild/misc.py | 6 +++---
src/pkgcore/fetch/__init__.py | 6 +++---
src/pkgcore/fs/contents.py | 4 ++--
src/pkgcore/pkgsets/glsa.py | 6 +++---
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/pkgcore/ebuild/misc.py b/src/pkgcore/ebuild/misc.py
index 25a0a7bb..e5df8be6 100644
--- a/src/pkgcore/ebuild/misc.py
+++ b/src/pkgcore/ebuild/misc.py
@@ -23,7 +23,7 @@ from functools import partial
from itertools import chain
from snakeoil import mappings
-from snakeoil.klass import alias_method, generic_equality
+from snakeoil.klass import alias_method, GenericEquality
from snakeoil.sequences import iflatten_instance
from ..restrictions import boolean, packages, restriction
@@ -166,7 +166,7 @@ class IncrementalsDict(mappings.DictMixin):
del x, s
-class collapsed_restrict_to_data(metaclass=generic_equality):
+class collapsed_restrict_to_data(GenericEquality):
__attr_comparison__ = ("defaults", "freeform", "atoms", "__class__")
incremental = True
@@ -383,7 +383,7 @@ def _build_cp_atom_payload(sequence, restrict,
payload_form=False):
return tuple(new_l)
-class ChunkedDataDict(metaclass=generic_equality):
+class ChunkedDataDict(GenericEquality):
__attr_comparison__ = ("_global_settings", "_dict")
def __init__(self):
diff --git a/src/pkgcore/fetch/__init__.py b/src/pkgcore/fetch/__init__.py
index d7790358..302da9bc 100644
--- a/src/pkgcore/fetch/__init__.py
+++ b/src/pkgcore/fetch/__init__.py
@@ -6,10 +6,10 @@ __all__ = ("fetchable", "mirror", "default_mirror",
"uri_list")
from itertools import zip_longest
-from snakeoil.klass import generic_equality
+from snakeoil.klass import GenericEquality
-class fetchable(metaclass=generic_equality):
+class fetchable(GenericEquality):
"""class representing uri sources for a file and chksum information."""
__slots__ = ("filename", "uri", "chksums")
@@ -53,7 +53,7 @@ class fetchable(metaclass=generic_equality):
return self.__class__(self.filename, uri=uri_list,
chksums=self.chksums)
-class mirror(metaclass=generic_equality):
+class mirror(GenericEquality):
"""uri source representing a mirror tier"""
__attr_comparison__ = ("mirror_name", "mirrors")
diff --git a/src/pkgcore/fs/contents.py b/src/pkgcore/fs/contents.py
index 8284cd34..5c139671 100644
--- a/src/pkgcore/fs/contents.py
+++ b/src/pkgcore/fs/contents.py
@@ -9,7 +9,7 @@ from functools import partial
from operator import attrgetter
from os.path import join as pjoin, normpath
-from snakeoil.klass import alias_method, generic_equality
+from snakeoil.klass import alias_method, GenericEquality
from . import fs
@@ -36,7 +36,7 @@ def check_instance(obj):
return obj.location, obj
-class contentsSet(metaclass=generic_equality):
+class contentsSet(GenericEquality):
"""set of :class:`pkgcore.fs.fs.fsBase` objects"""
__attr_comparison__ = ("_dict",)
diff --git a/src/pkgcore/pkgsets/glsa.py b/src/pkgcore/pkgsets/glsa.py
index 1a806f95..d8b092aa 100644
--- a/src/pkgcore/pkgsets/glsa.py
+++ b/src/pkgcore/pkgsets/glsa.py
@@ -10,7 +10,7 @@ from os.path import join as pjoin
from lxml import etree
from snakeoil.compatibility import IGNORED_EXCEPTIONS
from snakeoil.iterables import caching_iter
-from snakeoil.klass import generic_equality
+from snakeoil.klass import GenericEquality
from snakeoil.osutils import listdir_files
from ..config.hint import ConfigHint
@@ -22,7 +22,7 @@ from ..repository.util import get_virtual_repos
from ..restrictions import packages, restriction, values
-class GlsaDirSet(metaclass=generic_equality):
+class GlsaDirSet(GenericEquality):
"""generate a pkgset based on GLSA's distributed via a directory.
(rsync tree is the usual source.)
@@ -229,7 +229,7 @@ def find_vulnerable_repo_pkgs(glsa_src, repo,
grouped=False, arch=None):
yield restrict, matches
-class SecurityUpgrades(metaclass=generic_equality):
+class SecurityUpgrades(GenericEquality):
"""Set of packages for available security upgrades."""
pkgcore_config_type = ConfigHint(