commit: 959c195ce81f712de1bf912598b0b363d534fcb2
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 18 20:46:25 2025 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 18 20:46:25 2025 +0000
URL:
https://gitweb.gentoo.org/proj/pkgcore/pkgcore.git/commit/?id=959c195c
rename snakeoil.sequences.{iter_stable_unique -> unique_stable}
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
src/pkgcore/ebuild/ebd.py | 4 ++--
src/pkgcore/ebuild/repo_objs.py | 24 ++++++++++++------------
src/pkgcore/package/base.py | 2 +-
src/pkgcore/resolver/choice_point.py | 1 -
src/pkgcore/scripts/pmaint.py | 6 +++---
src/pkgcore/scripts/pquery.py | 4 ++--
6 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/src/pkgcore/ebuild/ebd.py b/src/pkgcore/ebuild/ebd.py
index 83b5e5bd..6346920a 100644
--- a/src/pkgcore/ebuild/ebd.py
+++ b/src/pkgcore/ebuild/ebd.py
@@ -39,7 +39,7 @@ from snakeoil.process.spawn import (
spawn,
spawn_bash,
)
-from snakeoil.sequences import iflatten_instance, iter_stable_unique
+from snakeoil.sequences import iflatten_instance, unique_stable
from .. import const
from ..log import logger
@@ -759,7 +759,7 @@ class buildable(ebd, setup_mixin, format.build):
self.env["PATH"] = os.pathsep.join(path)
# ordering must match appearance order in SRC_URI per PMS
- self.env["A"] = " ".join(iter_stable_unique(pkg.distfiles))
+ self.env["A"] = " ".join(unique_stable(pkg.distfiles))
if self.eapi.options.has_AA:
pkg = self.pkg
diff --git a/src/pkgcore/ebuild/repo_objs.py b/src/pkgcore/ebuild/repo_objs.py
index 2da0dff3..dd18e8d1 100644
--- a/src/pkgcore/ebuild/repo_objs.py
+++ b/src/pkgcore/ebuild/repo_objs.py
@@ -35,7 +35,7 @@ from snakeoil.fileutils import readfile, readlines
from snakeoil.osutils import listdir, listdir_files
from snakeoil.osutils.mount import umount
from snakeoil.process.namespaces import simple_unshare
-from snakeoil.sequences import iter_stable_unique
+from snakeoil.sequences import unique_stable
from snakeoil.strings import pluralism
from ..config.hint import ConfigHint
@@ -794,14 +794,14 @@ class RepoConfig(syncable.tree, klass.ImmutableInstance,
metaclass=WeakInstMeta)
hashes = data.get("manifest-hashes", "").lower().split()
if hashes:
hashes = ["size"] + hashes
- hashes = tuple(iter_stable_unique(hashes))
+ hashes = tuple(unique_stable(hashes))
else:
hashes = self.default_hashes
required_hashes = data.get("manifest-required-hashes",
"").lower().split()
if required_hashes:
required_hashes = ["size"] + required_hashes
- required_hashes = tuple(iter_stable_unique(required_hashes))
+ required_hashes = tuple(unique_stable(required_hashes))
else:
required_hashes = self.default_required_hashes
@@ -828,7 +828,7 @@ class RepoConfig(syncable.tree, klass.ImmutableInstance,
metaclass=WeakInstMeta)
_missing_masters = True
masters = ()
else:
- masters = tuple(iter_stable_unique(masters.split()))
+ masters = tuple(unique_stable(masters.split()))
sf(self, "_missing_masters", _missing_masters)
sf(self, "masters", masters)
aliases = data.get("aliases", "").split() + [
@@ -837,41 +837,41 @@ class RepoConfig(syncable.tree, klass.ImmutableInstance,
metaclass=WeakInstMeta)
self.pms_repo_name,
self.location,
]
- sf(self, "aliases", tuple(filter(None, iter_stable_unique(aliases))))
+ sf(self, "aliases", tuple(filter(None, unique_stable(aliases))))
sf(
self,
"eapis_deprecated",
- tuple(iter_stable_unique(data.get("eapis-deprecated",
"").split())),
+ tuple(unique_stable(data.get("eapis-deprecated", "").split())),
)
sf(
self,
"eapis_banned",
- tuple(iter_stable_unique(data.get("eapis-banned", "").split())),
+ tuple(unique_stable(data.get("eapis-banned", "").split())),
)
sf(
self,
"eapis_testing",
- tuple(iter_stable_unique(data.get("eapis-testing", "").split())),
+ tuple(unique_stable(data.get("eapis-testing", "").split())),
)
sf(
self,
"profile_eapis_deprecated",
- tuple(iter_stable_unique(data.get("profile-eapis-deprecated",
"").split())),
+ tuple(unique_stable(data.get("profile-eapis-deprecated",
"").split())),
)
sf(
self,
"profile_eapis_banned",
- tuple(iter_stable_unique(data.get("profile-eapis-banned",
"").split())),
+ tuple(unique_stable(data.get("profile-eapis-banned", "").split())),
)
sf(
self,
"properties_allowed",
- tuple(iter_stable_unique(data.get("properties-allowed",
"").split())),
+ tuple(unique_stable(data.get("properties-allowed", "").split())),
)
sf(
self,
"restrict_allowed",
- tuple(iter_stable_unique(data.get("restrict-allowed",
"").split())),
+ tuple(unique_stable(data.get("restrict-allowed", "").split())),
)
sf(self, "sign_commits", data.get("sign-commits", "false").lower() ==
"true")
diff --git a/src/pkgcore/package/base.py b/src/pkgcore/package/base.py
index 19185c62..3815050f 100644
--- a/src/pkgcore/package/base.py
+++ b/src/pkgcore/package/base.py
@@ -145,7 +145,7 @@ class DynamicGetattrSetter(type):
# only add slots for new attr's; assume the layer above already
slotted
# if this layer is setting slots.
class_dict["__slots__"] = tuple(
- sequences.iter_stable_unique(
+ sequences.unique_stable(
itertools.chain(slots,
set(new_functions).difference(existing))
)
)
diff --git a/src/pkgcore/resolver/choice_point.py
b/src/pkgcore/resolver/choice_point.py
index 0d3686ea..b145355f 100644
--- a/src/pkgcore/resolver/choice_point.py
+++ b/src/pkgcore/resolver/choice_point.py
@@ -1,7 +1,6 @@
__all__ = ("choice_point",)
from snakeoil import klass
-from snakeoil.sequences import iter_stable_unique
class choice_point:
diff --git a/src/pkgcore/scripts/pmaint.py b/src/pkgcore/scripts/pmaint.py
index bb1ae577..f3d4bae9 100644
--- a/src/pkgcore/scripts/pmaint.py
+++ b/src/pkgcore/scripts/pmaint.py
@@ -11,7 +11,7 @@ from os.path import join as pjoin
from snakeoil.cli import arghparse
from snakeoil.contexts import patch
from snakeoil.fileutils import AtomicWriteFile
-from snakeoil.sequences import iter_stable_unique
+from snakeoil.sequences import unique_stable
from ..cache.flat_hash import md5_cache
from ..ebuild import repository as ebuild_repo
@@ -86,7 +86,7 @@ def sync_main(options, out, err):
"""Update local repos to match their remotes."""
succeeded, failed = [], []
- for repo_name, repo in iter_stable_unique(options.repos):
+ for repo_name, repo in unique_stable(options.repos):
# rewrite the name if it has the usual prefix
if repo_name.startswith("conf:"):
repo_name = repo_name[5:]
@@ -374,7 +374,7 @@ def regen_main(options, out, err):
ret = []
observer = observer_mod.formatter_output(out)
- for repo in iter_stable_unique(options.repos):
+ for repo in unique_stable(options.repos):
if options.cache_dir is not None:
# recreate new repo object with cache dir override
cache = (md5_cache(pjoin(options.cache_dir.rstrip(os.sep),
repo.repo_id)),)
diff --git a/src/pkgcore/scripts/pquery.py b/src/pkgcore/scripts/pquery.py
index 95c8e065..13c50596 100644
--- a/src/pkgcore/scripts/pquery.py
+++ b/src/pkgcore/scripts/pquery.py
@@ -23,7 +23,7 @@ import snakeoil.formatters
from snakeoil.cli import arghparse
from snakeoil.formatters import decorate_forced_wrapping
from snakeoil.osutils import sizeof_fmt
-from snakeoil.sequences import iter_stable_unique
+from snakeoil.sequences import unique_stable
from ..ebuild import atom, conditionals
from ..fs import fs as fs_module
@@ -1227,7 +1227,7 @@ def _validate_args(parser, namespace):
attrs.extend(process_attrs(namespace.attr))
# finally, uniquify the attrs.
- namespace.attr = list(iter_stable_unique(attrs))
+ namespace.attr = list(unique_stable(attrs))
@argparser.bind_main_func
