diff --git a/src/qbpm/__init__.py b/src/qbpm/__init__.py index 670b3b9..a1833fb 100644 --- a/src/qbpm/__init__.py +++ b/src/qbpm/__init__.py @@ -1,8 +1,8 @@ from pathlib import Path from typing import Optional +from .log import error from .paths import qutebrowser_exe -from .utils import error try: from qbpm.version import version as __version__ # type: ignore diff --git a/src/qbpm/choose.py b/src/qbpm/choose.py index 190b043..16b6c0c 100644 --- a/src/qbpm/choose.py +++ b/src/qbpm/choose.py @@ -3,8 +3,8 @@ from pathlib import Path from . import Profile from .launch import launch_qutebrowser +from .log import error from .menus import find_menu -from .utils import error def choose_profile( diff --git a/src/qbpm/launch.py b/src/qbpm/launch.py index aff4ad1..f23ecc9 100644 --- a/src/qbpm/launch.py +++ b/src/qbpm/launch.py @@ -2,8 +2,8 @@ import shutil import subprocess from . import Profile +from .log import error from .paths import qutebrowser_exe -from .utils import error def launch_qutebrowser( diff --git a/src/qbpm/utils.py b/src/qbpm/log.py similarity index 100% rename from src/qbpm/utils.py rename to src/qbpm/log.py diff --git a/src/qbpm/main.py b/src/qbpm/main.py index 74ea615..f9ad1cd 100644 --- a/src/qbpm/main.py +++ b/src/qbpm/main.py @@ -10,9 +10,9 @@ import click from . import Profile, operations, profiles from .choose import choose_profile from .launch import launch_qutebrowser +from .log import error, or_phrase from .menus import supported_menus from .paths import default_profile_dir, qutebrowser_data_dir -from .utils import error, or_phrase CONTEXT_SETTINGS = {"help_option_names": ["-h", "--help"]} diff --git a/src/qbpm/menus.py b/src/qbpm/menus.py index 31040c2..c9b8e43 100644 --- a/src/qbpm/menus.py +++ b/src/qbpm/menus.py @@ -6,7 +6,7 @@ from os import environ from pathlib import Path from shutil import which -from .utils import error, or_phrase +from .log import error, or_phrase @dataclass diff --git a/src/qbpm/operations.py b/src/qbpm/operations.py index 0cc3462..0b9d671 100644 --- a/src/qbpm/operations.py +++ b/src/qbpm/operations.py @@ -3,7 +3,7 @@ from pathlib import Path from . import Profile, profiles from .desktop import create_desktop_file -from .utils import error +from .log import error def from_session( diff --git a/src/qbpm/profiles.py b/src/qbpm/profiles.py index 3be3dd7..a3d7914 100644 --- a/src/qbpm/profiles.py +++ b/src/qbpm/profiles.py @@ -4,8 +4,8 @@ from sys import platform from . import Profile from .desktop import create_desktop_file +from .log import error, or_phrase from .paths import qutebrowser_config_dirs -from .utils import error, or_phrase MIME_TYPES = [ "text/html",