Skip to content

Commit f06de15

Browse files
committed
Use extended Path class.
1 parent 05f1031 commit f06de15

24 files changed

+67
-31
lines changed

rubisco/cli/main/arg_parser.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
import argparse
2323
import os
2424
import sys
25-
from pathlib import Path
2625

2726
from rubisco.cli.main.help_formatter import RUHelpFormatter
2827
from rubisco.cli.main.version_action import CLIVersionAction, show_version
2928
from rubisco.cli.output import output_step
3029
from rubisco.lib.exceptions import RUError
3130
from rubisco.lib.l10n import _
31+
from rubisco.lib.pathlib import Path
3232
from rubisco.lib.variable import format_str, make_pretty
3333

3434
__all__ = ["arg_parser", "hook_commands", "early_arg_parse"]
@@ -120,7 +120,7 @@ def early_arg_parse() -> None:
120120
_("Missing argument for '--root' option."),
121121
)
122122
if root:
123-
root = Path(root).absolute()
123+
root = Path(root).absolute().normpath()
124124
output_step(
125125
format_str(
126126
_("Entering directory '${{path}}'"),

rubisco/cli/main/ktrigger.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,10 @@
5454
)
5555

5656
if TYPE_CHECKING:
57-
from pathlib import Path
58-
5957
from rubisco.envutils.env import RUEnvironment
6058
from rubisco.kernel.project_config import ProjectConfigration
6159
from rubisco.kernel.workflow import Step, Workflow
60+
from rubisco.lib.pathlib import Path
6261
from rubisco.lib.process import Process
6362
from rubisco.lib.version import Version
6463
from rubisco.shared.extension import IRUExtention

rubisco/cli/main/log_cleaner.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,14 @@
1919

2020
"""Utils for clean log. Called by the main entry point."""
2121

22-
from pathlib import Path
23-
2422
from rubisco.config import (
2523
DEFAULT_CHARSET,
2624
DEFAULT_LOG_KEEP_LINES,
2725
LOG_FILE,
2826
PIP_LOG_FILE,
2927
)
3028
from rubisco.lib.log import logger
29+
from rubisco.lib.pathlib import Path
3130

3231
__all__ = ["clean_log"]
3332

rubisco/cli/main/project_config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
from __future__ import annotations
2323

24-
from pathlib import Path
2524
from typing import TYPE_CHECKING
2625

2726
from rubisco.cli.main.arg_parser import hook_commands
@@ -30,6 +29,7 @@
3029
from rubisco.lib.exceptions import RUValueError
3130
from rubisco.lib.l10n import _
3231
from rubisco.lib.log import logger
32+
from rubisco.lib.pathlib import Path
3333
from rubisco.lib.variable import format_str, make_pretty
3434

3535
if TYPE_CHECKING:

rubisco/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323

2424
import os
2525
import sys
26-
from pathlib import Path
2726

2827
from rubisco.lib.command import command
28+
from rubisco.lib.pathlib import Path
2929
from rubisco.lib.version import Version
3030

3131
# Application basic configurations.

rubisco/envutils/env.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import threading
2727
import time
2828
import venv
29-
from pathlib import Path
3029

3130
from rubisco.config import (
3231
DB_FILENAME,
@@ -42,6 +41,7 @@
4241
from rubisco.lib.exceptions import RUError, RUOSError
4342
from rubisco.lib.l10n import _
4443
from rubisco.lib.log import logger
44+
from rubisco.lib.pathlib import Path
4545
from rubisco.lib.process import is_valid_pid
4646
from rubisco.lib.variable import format_str, make_pretty
4747
from rubisco.shared.ktrigger import IKernelTrigger, call_ktrigger

rubisco/envutils/env_db.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121

2222
import re
2323
import sqlite3
24-
from pathlib import Path
2524
from types import TracebackType
2625
from typing import NoReturn
2726

2827
from rubisco.envutils.packages import ExtensionPackageInfo
2928
from rubisco.lib.exceptions import RUError, RUValueError
3029
from rubisco.lib.l10n import _
3130
from rubisco.lib.log import logger
31+
from rubisco.lib.pathlib import Path
3232
from rubisco.lib.sqlite_strerror import sqlite_strerror
3333
from rubisco.lib.variable import format_str
3434
from rubisco.lib.version import Version

rubisco/envutils/packages.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import shutil
2727
import zipfile
2828
from dataclasses import dataclass
29-
from pathlib import Path
3029
from typing import TYPE_CHECKING
3130

3231
import json5
@@ -38,6 +37,7 @@
3837
from rubisco.lib.fileutil import TemporaryObject, rm_recursive
3938
from rubisco.lib.l10n import _
4039
from rubisco.lib.log import logger
40+
from rubisco.lib.pathlib import Path
4141
from rubisco.lib.variable import (
4242
AutoFormatDict,
4343
assert_iter_types,

rubisco/envutils/pip.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@
3131
from rubisco.shared.ktrigger import IKernelTrigger, call_ktrigger
3232

3333
if TYPE_CHECKING:
34-
from pathlib import Path
35-
3634
from rubisco.envutils.env import RUEnvironment
35+
from rubisco.lib.pathlib import Path
3736

3837
__all__ = ["install_pip_package", "install_requirements"]
3938

rubisco/envutils/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121

2222
import os
2323
import sys
24-
from pathlib import Path
2524

2625
from rubisco.lib.l10n import _
26+
from rubisco.lib.pathlib import Path
2727
from rubisco.lib.variable import format_str
2828
from rubisco.shared.ktrigger import IKernelTrigger, call_ktrigger
2929

0 commit comments

Comments
 (0)