Skip to content

Commit a33f39c

Browse files
committed
rename {snakeoil.osutils -> os.path}.pjoin
Signed-off-by: Arthur Zamarin <[email protected]>
1 parent 1bd5959 commit a33f39c

30 files changed

+36
-31
lines changed

src/pkgcheck/addons/caches.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
from dataclasses import dataclass
1111
from hashlib import blake2b
1212
from operator import attrgetter
13+
from os.path import join as pjoin
1314

1415
from snakeoil import klass
1516
from snakeoil.compatibility import IGNORED_EXCEPTIONS
1617
from snakeoil.fileutils import AtomicWriteFile
1718
from snakeoil.mappings import ImmutableDict
18-
from snakeoil.osutils import pjoin
1919

2020
from ..base import Addon, PkgcheckException, PkgcheckUserException
2121
from ..log import logger

src/pkgcheck/addons/eclass.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
import os
44
from functools import total_ordering
5+
from os.path import join as pjoin
56

67
from pkgcore.ebuild.eclass import EclassDoc
78
from snakeoil.klass import jit_attr_none
89
from snakeoil.mappings import ImmutableDict
9-
from snakeoil.osutils import pjoin
1010

1111
from .. import base
1212
from . import caches

src/pkgcheck/addons/git.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
from datetime import datetime
1414
from functools import partial
1515
from itertools import takewhile
16+
from os.path import join as pjoin
1617

1718
from pathspec import PathSpec
1819
from pkgcore.ebuild import cpv
@@ -25,7 +26,6 @@
2526
from snakeoil.contexts import GitStash
2627
from snakeoil.klass import jit_attr
2728
from snakeoil.mappings import ImmutableDict, OrderedSet
28-
from snakeoil.osutils import pjoin
2929
from snakeoil.process import CommandNotFound, find_binary
3030
from snakeoil.strings import pluralism
3131

src/pkgcheck/addons/profiles.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from collections import defaultdict
66
from functools import partial
77
from itertools import chain
8+
from os.path import join as pjoin
89

910
from pkgcore.ebuild import domain, misc
1011
from pkgcore.ebuild import profiles as profiles_mod
@@ -14,7 +15,6 @@
1415
from snakeoil.decorators import coroutine
1516
from snakeoil.klass import jit_attr
1617
from snakeoil.mappings import ImmutableDict
17-
from snakeoil.osutils import pjoin
1818

1919
from .. import base
2020
from ..base import PkgcheckUserException

src/pkgcheck/checks/acct.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
from configparser import ConfigParser
66
from functools import partial
77
from itertools import chain
8+
from os.path import join as pjoin
89

910
from pkgcore.ebuild import restricts
1011
from pkgcore.restrictions import packages
11-
from snakeoil.osutils import pjoin
1212

1313
from .. import results, sources
1414
from . import GentooRepoCheck, RepoCheck, SkipCheck

src/pkgcheck/checks/git.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
from datetime import datetime
1010
from itertools import chain
1111
from operator import attrgetter
12+
from os.path import join as pjoin
1213
from tempfile import TemporaryDirectory
1314
from urllib.parse import urlparse
1415

@@ -17,7 +18,6 @@
1718
from pkgcore.fetch import fetchable
1819
from snakeoil import klass
1920
from snakeoil.mappings import ImmutableDict
20-
from snakeoil.osutils import pjoin
2121
from snakeoil.sequences import iflatten_instance
2222
from snakeoil.strings import pluralism
2323

src/pkgcheck/checks/glsa.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import os
22
from collections import defaultdict
3+
from os.path import join as pjoin
34

45
from pkgcore.pkgsets.glsa import GlsaDirSet
56
from pkgcore.restrictions import packages, values
67
from pkgcore.restrictions.util import collect_package_restrictions
78
from snakeoil.cli.arghparse import existent_dir
8-
from snakeoil.osutils import pjoin
99
from snakeoil.strings import pluralism
1010

1111
from .. import results

src/pkgcheck/checks/metadata_xml.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
import re
33
from difflib import SequenceMatcher
44
from itertools import chain
5+
from os.path import join as pjoin
56

67
from lxml import etree
78
from pkgcore import const as pkgcore_const
89
from pkgcore.ebuild.atom import MalformedAtom, atom
910
from pkgcore.fetch import fetchable
1011
from pkgcore.restrictions.packages import Conditional
11-
from snakeoil.osutils import pjoin
1212
from snakeoil.sequences import iflatten_instance
1313
from snakeoil.strings import pluralism
1414

src/pkgcheck/checks/perl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import multiprocessing
22
import re
33
import subprocess
4+
from os.path import join as pjoin
45

56
from pkgcore.ebuild.atom import atom as atom_cls
67
from pkgcore.package.errors import MetadataException
7-
from snakeoil.osutils import pjoin
88
from snakeoil.sequences import iflatten_instance
99

1010
from .. import const, results, sources

src/pkgcheck/checks/pkgdir.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
import stat
33
from collections import defaultdict
44
from datetime import datetime
5+
from os import listdir
6+
from os.path import join as pjoin
57

68
from pkgcore.ebuild.atom import MalformedAtom
79
from pkgcore.ebuild.atom import atom as atom_cls
810
from snakeoil.chksum import get_chksums
9-
from snakeoil.osutils import listdir, pjoin, sizeof_fmt
11+
from snakeoil.osutils import sizeof_fmt
1012
from snakeoil.strings import pluralism
1113

1214
from .. import addons, results, sources

0 commit comments

Comments
 (0)