Skip to content

Commit b770b2b

Browse files
committed
rename {snakeoil.osutils -> os.path}.pjoin
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
1 parent ff5191f commit b770b2b

8 files changed

Lines changed: 10 additions & 9 deletions

File tree

src/pkgdev/scripts/pkgdev_bugs.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 chain
16+
from os.path import join as pjoin
1617
from urllib.parse import urlencode
1718

1819
from pkgcheck import const as pkgcheck_const
@@ -34,7 +35,6 @@
3435
from snakeoil.cli.input import userquery
3536
from snakeoil.data_source import bytes_data_source
3637
from snakeoil.formatters import Formatter
37-
from snakeoil.osutils import pjoin
3838

3939
from ..cli import ArgumentParser
4040
from .argparsers import BugzillaApiKey, _determine_cwd_repo, cwd_repo_argparser

src/pkgdev/scripts/pkgdev_commit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
from enum import Enum
1515
from functools import partial
1616
from itertools import chain
17+
from os.path import join as pjoin
1718

1819
from pkgcheck import reporters, scan
1920
from pkgcore.ebuild.atom import MalformedAtom
@@ -26,7 +27,6 @@
2627
from snakeoil.cli.input import userquery
2728
from snakeoil.klass import jit_attr
2829
from snakeoil.mappings import OrderedFrozenSet, OrderedSet
29-
from snakeoil.osutils import pjoin
3030

3131
from .. import cli, git
3232
from ..mangle import GentooMangler, Mangler

src/pkgdev/scripts/pkgdev_mask.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
from datetime import datetime, timedelta, timezone
1212
from itertools import groupby
1313
from operator import itemgetter
14+
from os.path import join as pjoin
1415
from typing import List
1516

1617
from pkgcore.ebuild.atom import MalformedAtom
1718
from pkgcore.ebuild.atom import atom as atom_cls
1819
from pkgcore.ebuild.profiles import ProfileNode
1920
from snakeoil.bash import read_bash
2021
from snakeoil.cli import arghparse
21-
from snakeoil.osutils import pjoin
2222
from snakeoil.strings import pluralism
2323

2424
from .. import git

tests/scripts/test_pkgdev_bugs.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import itertools
2-
import os
32
import json
3+
import os
44
import textwrap
5+
from os.path import join as pjoin
56
from unittest.mock import patch
67

78
from pkgcore.ebuild.atom import atom
9+
810
from pkgdev.scripts import pkgdev_bugs as bugs
9-
from snakeoil.osutils import pjoin
1011

1112

1213
def mk_pkg(repo, cpvstr, maintainers, **kwargs):

tests/scripts/test_pkgdev_commit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
from datetime import datetime
66
from functools import partial
77
from io import StringIO
8+
from os.path import join as pjoin
89
from unittest.mock import patch
910

1011
import pytest
1112
from snakeoil.contexts import os_environ
12-
from snakeoil.osutils import pjoin
1313

1414
from pkgdev.mangle import copyright_regex, keywords_regex
1515
from pkgdev.scripts import run

tests/scripts/test_pkgdev_manifest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
from contextlib import chdir
22
from functools import partial
3+
from os.path import join as pjoin
34
from typing import List, Set
45
from unittest.mock import patch
56

67
import pytest
7-
from snakeoil.osutils import pjoin
88

99
from pkgdev.scripts import run
1010

tests/scripts/test_pkgdev_mask.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
from contextlib import chdir
55
from datetime import datetime, timedelta, timezone
66
from functools import partial
7+
from os.path import join as pjoin
78
from pathlib import Path
89
from unittest.mock import patch
910

1011
import pytest
1112
from pkgcore.ebuild.atom import atom as atom_cls
1213
from snakeoil.contexts import os_environ
13-
from snakeoil.osutils import pjoin
1414

1515
from pkgdev.scripts import run
1616

tests/scripts/test_pkgdev_push.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
from contextlib import chdir
44
from functools import partial
55
from io import StringIO
6+
from os.path import join as pjoin
67
from unittest.mock import patch
78

89
import pytest
9-
from snakeoil.osutils import pjoin
1010

1111
from pkgdev.scripts import run
1212

0 commit comments

Comments
 (0)