commit: a33f39cf78987acb4f22d42f6b2101d58017fb8e
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 2 11:04:35 2026 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 2 11:09:01 2026 +0000
URL:
https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=a33f39cf
rename {snakeoil.osutils -> os.path}.pjoin
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
src/pkgcheck/addons/caches.py | 2 +-
src/pkgcheck/addons/eclass.py | 2 +-
src/pkgcheck/addons/git.py | 2 +-
src/pkgcheck/addons/profiles.py | 2 +-
src/pkgcheck/checks/acct.py | 2 +-
src/pkgcheck/checks/git.py | 2 +-
src/pkgcheck/checks/glsa.py | 2 +-
src/pkgcheck/checks/metadata_xml.py | 2 +-
src/pkgcheck/checks/perl.py | 2 +-
src/pkgcheck/checks/pkgdir.py | 4 +++-
src/pkgcheck/checks/profiles.py | 2 +-
src/pkgcheck/checks/repo.py | 3 +--
src/pkgcheck/scripts/pkgcheck_cache.py | 2 +-
src/pkgcheck/scripts/pkgcheck_scan.py | 2 +-
src/pkgcheck/sources.py | 3 ++-
testdata/pkgcheck | 2 +-
tests/addons/test_addons.py | 2 +-
tests/addons/test_eclass.py | 2 +-
tests/addons/test_git.py | 2 +-
tests/checks/test_git.py | 2 +-
tests/checks/test_glsa.py | 2 +-
tests/checks/test_metadata.py | 2 +-
tests/checks/test_pkgdir.py | 3 ++-
tests/checks/test_repo.py | 3 ++-
tests/checks/test_repo_metadata.py | 2 +-
tests/checks/test_stablereq.py | 2 +-
tests/conftest.py | 2 +-
tests/misc.py | 2 +-
tests/scripts/test_pkgcheck_scan.py | 2 +-
tests/test_feeds.py | 3 ++-
30 files changed, 36 insertions(+), 31 deletions(-)
diff --git a/src/pkgcheck/addons/caches.py b/src/pkgcheck/addons/caches.py
index a6c94b73..e78c062a 100644
--- a/src/pkgcheck/addons/caches.py
+++ b/src/pkgcheck/addons/caches.py
@@ -10,12 +10,12 @@ from collections import UserDict
from dataclasses import dataclass
from hashlib import blake2b
from operator import attrgetter
+from os.path import join as pjoin
from snakeoil import klass
from snakeoil.compatibility import IGNORED_EXCEPTIONS
from snakeoil.fileutils import AtomicWriteFile
from snakeoil.mappings import ImmutableDict
-from snakeoil.osutils import pjoin
from ..base import Addon, PkgcheckException, PkgcheckUserException
from ..log import logger
diff --git a/src/pkgcheck/addons/eclass.py b/src/pkgcheck/addons/eclass.py
index 5e5e77ee..30f5b559 100644
--- a/src/pkgcheck/addons/eclass.py
+++ b/src/pkgcheck/addons/eclass.py
@@ -2,11 +2,11 @@
import os
from functools import total_ordering
+from os.path import join as pjoin
from pkgcore.ebuild.eclass import EclassDoc
from snakeoil.klass import jit_attr_none
from snakeoil.mappings import ImmutableDict
-from snakeoil.osutils import pjoin
from .. import base
from . import caches
diff --git a/src/pkgcheck/addons/git.py b/src/pkgcheck/addons/git.py
index 2c8f1094..f735b15e 100644
--- a/src/pkgcheck/addons/git.py
+++ b/src/pkgcheck/addons/git.py
@@ -13,6 +13,7 @@ from dataclasses import dataclass
from datetime import datetime
from functools import partial
from itertools import takewhile
+from os.path import join as pjoin
from pathspec import PathSpec
from pkgcore.ebuild import cpv
@@ -25,7 +26,6 @@ from snakeoil.cli import arghparse
from snakeoil.contexts import GitStash
from snakeoil.klass import jit_attr
from snakeoil.mappings import ImmutableDict, OrderedSet
-from snakeoil.osutils import pjoin
from snakeoil.process import CommandNotFound, find_binary
from snakeoil.strings import pluralism
diff --git a/src/pkgcheck/addons/profiles.py b/src/pkgcheck/addons/profiles.py
index e5a3ec37..d0ad5217 100644
--- a/src/pkgcheck/addons/profiles.py
+++ b/src/pkgcheck/addons/profiles.py
@@ -5,6 +5,7 @@ import stat
from collections import defaultdict
from functools import partial
from itertools import chain
+from os.path import join as pjoin
from pkgcore.ebuild import domain, misc
from pkgcore.ebuild import profiles as profiles_mod
@@ -14,7 +15,6 @@ from snakeoil.containers import ProtectedSet
from snakeoil.decorators import coroutine
from snakeoil.klass import jit_attr
from snakeoil.mappings import ImmutableDict
-from snakeoil.osutils import pjoin
from .. import base
from ..base import PkgcheckUserException
diff --git a/src/pkgcheck/checks/acct.py b/src/pkgcheck/checks/acct.py
index 47015953..cf068734 100644
--- a/src/pkgcheck/checks/acct.py
+++ b/src/pkgcheck/checks/acct.py
@@ -5,10 +5,10 @@ from collections import defaultdict
from configparser import ConfigParser
from functools import partial
from itertools import chain
+from os.path import join as pjoin
from pkgcore.ebuild import restricts
from pkgcore.restrictions import packages
-from snakeoil.osutils import pjoin
from .. import results, sources
from . import GentooRepoCheck, RepoCheck, SkipCheck
diff --git a/src/pkgcheck/checks/git.py b/src/pkgcheck/checks/git.py
index cde26dca..abcb6e5d 100644
--- a/src/pkgcheck/checks/git.py
+++ b/src/pkgcheck/checks/git.py
@@ -9,6 +9,7 @@ from collections import defaultdict
from datetime import datetime
from itertools import chain
from operator import attrgetter
+from os.path import join as pjoin
from tempfile import TemporaryDirectory
from urllib.parse import urlparse
@@ -17,7 +18,6 @@ from pkgcore.ebuild.repository import UnconfiguredTree
from pkgcore.fetch import fetchable
from snakeoil import klass
from snakeoil.mappings import ImmutableDict
-from snakeoil.osutils import pjoin
from snakeoil.sequences import iflatten_instance
from snakeoil.strings import pluralism
diff --git a/src/pkgcheck/checks/glsa.py b/src/pkgcheck/checks/glsa.py
index 79d4ec65..bb89c4e0 100644
--- a/src/pkgcheck/checks/glsa.py
+++ b/src/pkgcheck/checks/glsa.py
@@ -1,11 +1,11 @@
import os
from collections import defaultdict
+from os.path import join as pjoin
from pkgcore.pkgsets.glsa import GlsaDirSet
from pkgcore.restrictions import packages, values
from pkgcore.restrictions.util import collect_package_restrictions
from snakeoil.cli.arghparse import existent_dir
-from snakeoil.osutils import pjoin
from snakeoil.strings import pluralism
from .. import results
diff --git a/src/pkgcheck/checks/metadata_xml.py
b/src/pkgcheck/checks/metadata_xml.py
index 2f6d3c4e..12d17112 100644
--- a/src/pkgcheck/checks/metadata_xml.py
+++ b/src/pkgcheck/checks/metadata_xml.py
@@ -2,13 +2,13 @@ import os
import re
from difflib import SequenceMatcher
from itertools import chain
+from os.path import join as pjoin
from lxml import etree
from pkgcore import const as pkgcore_const
from pkgcore.ebuild.atom import MalformedAtom, atom
from pkgcore.fetch import fetchable
from pkgcore.restrictions.packages import Conditional
-from snakeoil.osutils import pjoin
from snakeoil.sequences import iflatten_instance
from snakeoil.strings import pluralism
diff --git a/src/pkgcheck/checks/perl.py b/src/pkgcheck/checks/perl.py
index 839381ae..48998e1f 100644
--- a/src/pkgcheck/checks/perl.py
+++ b/src/pkgcheck/checks/perl.py
@@ -1,10 +1,10 @@
import multiprocessing
import re
import subprocess
+from os.path import join as pjoin
from pkgcore.ebuild.atom import atom as atom_cls
from pkgcore.package.errors import MetadataException
-from snakeoil.osutils import pjoin
from snakeoil.sequences import iflatten_instance
from .. import const, results, sources
diff --git a/src/pkgcheck/checks/pkgdir.py b/src/pkgcheck/checks/pkgdir.py
index ef90baac..3ae644ce 100644
--- a/src/pkgcheck/checks/pkgdir.py
+++ b/src/pkgcheck/checks/pkgdir.py
@@ -2,11 +2,13 @@ import os
import stat
from collections import defaultdict
from datetime import datetime
+from os import listdir
+from os.path import join as pjoin
from pkgcore.ebuild.atom import MalformedAtom
from pkgcore.ebuild.atom import atom as atom_cls
from snakeoil.chksum import get_chksums
-from snakeoil.osutils import listdir, pjoin, sizeof_fmt
+from snakeoil.osutils import sizeof_fmt
from snakeoil.strings import pluralism
from .. import addons, results, sources
diff --git a/src/pkgcheck/checks/profiles.py b/src/pkgcheck/checks/profiles.py
index c481ba82..ad1b8a16 100644
--- a/src/pkgcheck/checks/profiles.py
+++ b/src/pkgcheck/checks/profiles.py
@@ -3,13 +3,13 @@
import os
from collections import defaultdict
from datetime import datetime
+from os.path import join as pjoin
from typing import Iterable
from pkgcore.ebuild import misc
from pkgcore.ebuild import profiles as profiles_mod
from pkgcore.ebuild.atom import atom as atom_cls
from pkgcore.ebuild.repo_objs import Profiles
-from snakeoil.osutils import pjoin
from snakeoil.sequences import iflatten_instance
from snakeoil.strings import pluralism
diff --git a/src/pkgcheck/checks/repo.py b/src/pkgcheck/checks/repo.py
index 08abe802..63eaae1d 100644
--- a/src/pkgcheck/checks/repo.py
+++ b/src/pkgcheck/checks/repo.py
@@ -1,7 +1,6 @@
import os
import pathlib
-
-from snakeoil.osutils import pjoin
+from os.path import join as pjoin
from .. import addons, base, results, sources
from ..packages import RawCPV
diff --git a/src/pkgcheck/scripts/pkgcheck_cache.py
b/src/pkgcheck/scripts/pkgcheck_cache.py
index da323a30..8eee11de 100644
--- a/src/pkgcheck/scripts/pkgcheck_cache.py
+++ b/src/pkgcheck/scripts/pkgcheck_cache.py
@@ -1,8 +1,8 @@
import os
+from os.path import join as pjoin
import snakeoil.formatters
from snakeoil.cli import arghparse
-from snakeoil.osutils import pjoin
from .. import base, const
from ..addons import init_addon
diff --git a/src/pkgcheck/scripts/pkgcheck_scan.py
b/src/pkgcheck/scripts/pkgcheck_scan.py
index de22def6..d4e812b0 100644
--- a/src/pkgcheck/scripts/pkgcheck_scan.py
+++ b/src/pkgcheck/scripts/pkgcheck_scan.py
@@ -2,6 +2,7 @@ import argparse
import os
import shlex
from contextlib import ExitStack
+from os.path import join as pjoin
from unittest.mock import patch
import snakeoil.formatters
@@ -12,7 +13,6 @@ from pkgcore.restrictions import packages
from pkgcore.restrictions.util import collect_package_restrictions
from pkgcore.util import parserestrict
from snakeoil.cli import arghparse
-from snakeoil.osutils import pjoin
from .. import base, const, objects
from ..base import PkgcheckUserException
diff --git a/src/pkgcheck/sources.py b/src/pkgcheck/sources.py
index b94f9758..c88b834c 100644
--- a/src/pkgcheck/sources.py
+++ b/src/pkgcheck/sources.py
@@ -9,12 +9,13 @@ from collections.abc import Set
from dataclasses import dataclass
from itertools import groupby
from operator import attrgetter
+from os.path import join as pjoin
from pkgcore.ebuild.profiles import ProfileError
from pkgcore.ebuild.repository import UnconfiguredTree, tree
from pkgcore.restrictions import packages
from snakeoil import klass
-from snakeoil.osutils import listdir_files, pjoin
+from snakeoil.osutils import listdir_files
from . import addons, base
from .addons.eclass import Eclass, EclassAddon
diff --git a/testdata/pkgcheck b/testdata/pkgcheck
index 082fb9f7..6cd18e8f 100755
--- a/testdata/pkgcheck
+++ b/testdata/pkgcheck
@@ -6,10 +6,10 @@ import os
import sys
import tempfile
import textwrap
+from os.path import join as pjoin
from unittest.mock import patch
from pkgcore import const as pkgcore_const
-from snakeoil.osutils import pjoin
# make sure to use git repo version of pkgcheck
main_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
diff --git a/tests/addons/test_addons.py b/tests/addons/test_addons.py
index e0dff295..8fab297f 100644
--- a/tests/addons/test_addons.py
+++ b/tests/addons/test_addons.py
@@ -1,9 +1,9 @@
import os
+from os.path import join as pjoin
from unittest.mock import patch
import pytest
from pkgcore.restrictions import packages
-from snakeoil.osutils import pjoin
from pkgcheck import addons
from pkgcheck.base import PkgcheckUserException
diff --git a/tests/addons/test_eclass.py b/tests/addons/test_eclass.py
index ae4a01a4..cc71df6b 100644
--- a/tests/addons/test_eclass.py
+++ b/tests/addons/test_eclass.py
@@ -1,11 +1,11 @@
import os
import textwrap
+from os.path import join as pjoin
from time import sleep
from unittest.mock import patch
import pytest
from snakeoil.fileutils import touch
-from snakeoil.osutils import pjoin
from pkgcheck.addons import init_addon
from pkgcheck.addons.caches import CacheDisabled
diff --git a/tests/addons/test_git.py b/tests/addons/test_git.py
index 9012a0c5..5e168aa0 100644
--- a/tests/addons/test_git.py
+++ b/tests/addons/test_git.py
@@ -1,6 +1,7 @@
import os
import subprocess
from functools import partial
+from os.path import join as pjoin
from unittest.mock import Mock, patch
import pytest
@@ -10,7 +11,6 @@ from pkgcore.restrictions import packages
from snakeoil.cli.exceptions import UserException
from snakeoil.contexts import os_environ
from snakeoil.fileutils import touch
-from snakeoil.osutils import pjoin
from snakeoil.process import CommandNotFound, find_binary
from pkgcheck import base
diff --git a/tests/checks/test_git.py b/tests/checks/test_git.py
index 0784dd11..65025eb2 100644
--- a/tests/checks/test_git.py
+++ b/tests/checks/test_git.py
@@ -2,6 +2,7 @@ import os
import textwrap
import time
from datetime import datetime, timedelta
+from os.path import join as pjoin
from unittest.mock import patch
import pytest
@@ -10,7 +11,6 @@ from pkgcore.ebuild.cpv import VersionedCPV as CPV
from pkgcore.test.misc import FakeRepo
from snakeoil.cli import arghparse
from snakeoil.fileutils import touch
-from snakeoil.osutils import pjoin
from pkgcheck.addons.git import GitCommit
from pkgcheck.base import PkgcheckUserException
diff --git a/tests/checks/test_glsa.py b/tests/checks/test_glsa.py
index 5b8c673c..f3cc906f 100644
--- a/tests/checks/test_glsa.py
+++ b/tests/checks/test_glsa.py
@@ -1,10 +1,10 @@
import os
+from os.path import join as pjoin
import pytest
from pkgcore.ebuild import repo_objs, repository
from pkgcore.test.misc import mk_glsa
from snakeoil.cli import arghparse
-from snakeoil.osutils import pjoin
from pkgcheck.checks import SkipCheck, glsa
diff --git a/tests/checks/test_metadata.py b/tests/checks/test_metadata.py
index b194b726..30b1eceb 100644
--- a/tests/checks/test_metadata.py
+++ b/tests/checks/test_metadata.py
@@ -5,13 +5,13 @@ from datetime import datetime, timedelta
from functools import partial
from itertools import combinations
from operator import attrgetter
+from os.path import join as pjoin
import pytest
from pkgcore.ebuild import eapi, repo_objs, repository
from pkgcore.ebuild.cpv import VersionedCPV as CPV
from pkgcore.test.misc import FakePkg, FakeRepo
from snakeoil.cli import arghparse
-from snakeoil.osutils import pjoin
from pkgcheck import addons
from pkgcheck.checks import metadata
diff --git a/tests/checks/test_pkgdir.py b/tests/checks/test_pkgdir.py
index 7a74e755..0e566e67 100644
--- a/tests/checks/test_pkgdir.py
+++ b/tests/checks/test_pkgdir.py
@@ -1,12 +1,13 @@
import os
from datetime import datetime, timedelta
+from os.path import join as pjoin
import pytest
from pkgcore.ebuild.cpv import UnversionedCPV
from pkgcore.test.misc import FakeRepo
from snakeoil.cli import arghparse
from snakeoil.fileutils import touch
-from snakeoil.osutils import ensure_dirs, pjoin
+from snakeoil.osutils import ensure_dirs
from pkgcheck import addons
from pkgcheck.checks import SkipCheck, pkgdir
diff --git a/tests/checks/test_repo.py b/tests/checks/test_repo.py
index d405322b..04f2e8d1 100644
--- a/tests/checks/test_repo.py
+++ b/tests/checks/test_repo.py
@@ -1,11 +1,12 @@
import os
+from os.path import join as pjoin
from unittest import mock
from pkgcore.ebuild import atom
from pkgcore.test.misc import FakeRepo
from snakeoil.cli import arghparse
from snakeoil.fileutils import touch
-from snakeoil.osutils import ensure_dirs, pjoin
+from snakeoil.osutils import ensure_dirs
from pkgcheck import addons
from pkgcheck.checks import repo
diff --git a/tests/checks/test_repo_metadata.py
b/tests/checks/test_repo_metadata.py
index f4c8936c..3d08374b 100644
--- a/tests/checks/test_repo_metadata.py
+++ b/tests/checks/test_repo_metadata.py
@@ -1,9 +1,9 @@
import os
+from os.path import join as pjoin
from pkgcore.ebuild.repository import UnconfiguredTree
from pkgcore.test.misc import FakePkg
from snakeoil.cli import arghparse
-from snakeoil.osutils import pjoin
from pkgcheck.checks import repo_metadata
diff --git a/tests/checks/test_stablereq.py b/tests/checks/test_stablereq.py
index 9901ff47..23ac8302 100644
--- a/tests/checks/test_stablereq.py
+++ b/tests/checks/test_stablereq.py
@@ -1,9 +1,9 @@
import os
from datetime import datetime, timedelta
+from os.path import join as pjoin
import pytest
from pkgcore.ebuild.cpv import VersionedCPV
-from snakeoil.osutils import pjoin
from pkgcheck.checks import SkipCheck
from pkgcheck.checks.stablereq import StableRequest, StableRequestCheck
diff --git a/tests/conftest.py b/tests/conftest.py
index 525fee83..e76e7885 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -2,6 +2,7 @@ import os
import tempfile
import textwrap
from contextlib import ExitStack
+from os.path import join as pjoin
from pathlib import Path
from unittest.mock import patch
@@ -10,7 +11,6 @@ from pkgcore import const as pkgcore_const
from snakeoil.cli.arghparse import ArgumentParser
from snakeoil.contexts import os_environ
from snakeoil.formatters import PlainTextFormatter
-from snakeoil.osutils import pjoin
from pkgcheck.addons.git import GitConfig
from pkgcheck.cli import Tool
diff --git a/tests/misc.py b/tests/misc.py
index 5df9a97a..340c15a4 100644
--- a/tests/misc.py
+++ b/tests/misc.py
@@ -2,6 +2,7 @@ import multiprocessing
import random
import string
from dataclasses import dataclass
+from os.path import join as pjoin
from typing import List
import pytest
@@ -16,7 +17,6 @@ from pkgcore.repository import prototype
from pkgcore.repository.util import SimpleTree
from snakeoil.cli import arghparse
from snakeoil.data_source import text_data_source
-from snakeoil.osutils import pjoin
from snakeoil.sequences import split_negations
from pkgcheck import addons, base, sources
diff --git a/tests/scripts/test_pkgcheck_scan.py
b/tests/scripts/test_pkgcheck_scan.py
index 8ae93637..bb9ad6bc 100644
--- a/tests/scripts/test_pkgcheck_scan.py
+++ b/tests/scripts/test_pkgcheck_scan.py
@@ -13,6 +13,7 @@ from dataclasses import dataclass
from functools import partial
from io import StringIO
from operator import attrgetter
+from os.path import join as pjoin
from unittest.mock import patch
import pytest
@@ -22,7 +23,6 @@ from pkgcore.restrictions import packages
from snakeoil.contexts import chdir, os_environ
from snakeoil.fileutils import touch
from snakeoil.formatters import PlainTextFormatter
-from snakeoil.osutils import pjoin
from pkgcheck import __title__ as project
from pkgcheck import base, const, objects, reporters, scan
diff --git a/tests/test_feeds.py b/tests/test_feeds.py
index dfca7a1d..1a7bb696 100644
--- a/tests/test_feeds.py
+++ b/tests/test_feeds.py
@@ -1,5 +1,6 @@
+from os.path import join as pjoin
+
import pytest
-from snakeoil.osutils import pjoin
from pkgcheck import addons, feeds
