diff options
author | Trygve Aaberge <trygveaa@gmail.com> | 2022-10-29 17:02:10 +0200 |
---|---|---|
committer | Trygve Aaberge <trygveaa@gmail.com> | 2024-02-18 11:32:52 +0100 |
commit | af7cd8c200a7d5dafac4ab2e5afdc1978bd3d308 (patch) | |
tree | d07695bca4ff218b19c98dfacbebb8e370804ff8 | |
parent | acaf2e81719ba160aac3bc7c3c78fc4db3d13f65 (diff) | |
download | wee-slack-af7cd8c200a7d5dafac4ab2e5afdc1978bd3d308.tar.gz |
Don't use relative imports
-rwxr-xr-x | combine.sh | 2 | ||||
-rw-r--r-- | slack/api.py | 3 | ||||
-rw-r--r-- | slack/config.py | 8 | ||||
-rw-r--r-- | slack/http.py | 6 | ||||
-rw-r--r-- | slack/log.py | 2 | ||||
-rw-r--r-- | slack/main.py | 3 | ||||
-rw-r--r-- | slack/shared.py | 6 | ||||
-rw-r--r-- | slack/task.py | 4 | ||||
-rw-r--r-- | slack/util.py | 2 |
9 files changed, 17 insertions, 19 deletions
@@ -1,6 +1,6 @@ #!/bin/bash -contents="$(cat slack/*.py slack.py | grep -Ev '^from (\.|slack)')" +contents="$(cat slack/*.py slack.py | grep -Ev '^from slack[. ]')" echo "$contents" | grep '^from __future__' | sort -u > combined.py echo "$contents" | grep -v '^from __future__' | grep -E '^(import|from)' | sort -u >> combined.py diff --git a/slack/api.py b/slack/api.py index 4cdc53d..19cfb11 100644 --- a/slack/api.py +++ b/slack/api.py @@ -4,10 +4,9 @@ import json from typing import TYPE_CHECKING, Dict, Union from urllib.parse import urlencode +from slack.http import http_request from slack.shared import shared -from .http import http_request - if TYPE_CHECKING: from slack_api import SlackConversation, SlackConversationIm, SlackConversationNotIm diff --git a/slack/config.py b/slack/config.py index 56233a0..68395be 100644 --- a/slack/config.py +++ b/slack/config.py @@ -5,10 +5,10 @@ from typing import Generic, TypeVar, Union, cast import weechat -from .api import SlackWorkspace -from .log import print_error -from .shared import shared -from .util import get_callback_name +from slack.api import SlackWorkspace +from slack.log import print_error +from slack.shared import shared +from slack.util import get_callback_name class WeeChatColor(str): diff --git a/slack/http.py b/slack/http.py index 24681a0..794164d 100644 --- a/slack/http.py +++ b/slack/http.py @@ -5,9 +5,9 @@ from typing import Dict import weechat -from .log import LogLevel, log -from .task import FutureProcess, sleep, weechat_task_cb -from .util import get_callback_name +from slack.log import LogLevel, log +from slack.task import FutureProcess, sleep, weechat_task_cb +from slack.util import get_callback_name class HttpError(Exception): diff --git a/slack/log.py b/slack/log.py index 10dc803..2c8a679 100644 --- a/slack/log.py +++ b/slack/log.py @@ -2,7 +2,7 @@ from enum import IntEnum import weechat -from .shared import shared +from slack.shared import shared class LogLevel(IntEnum): diff --git a/slack/main.py b/slack/main.py index 9d31eac..27a3a40 100644 --- a/slack/main.py +++ b/slack/main.py @@ -1,8 +1,7 @@ import weechat from slack.config import SlackWorkspace - -from .shared import shared +from slack.shared import shared async def init(): diff --git a/slack/shared.py b/slack/shared.py index 0c2f71b..67d6c9c 100644 --- a/slack/shared.py +++ b/slack/shared.py @@ -3,9 +3,9 @@ from __future__ import annotations from typing import TYPE_CHECKING, Any, Dict, Tuple if TYPE_CHECKING: - from .api import SlackWorkspace - from .config import SlackConfig - from .task import Task + from slack.api import SlackWorkspace + from slack.config import SlackConfig + from slack.task import Task class Shared: diff --git a/slack/task.py b/slack/task.py index 80687a6..2caf264 100644 --- a/slack/task.py +++ b/slack/task.py @@ -5,8 +5,8 @@ from uuid import uuid4 import weechat -from .shared import shared -from .util import get_callback_name +from slack.shared import shared +from slack.util import get_callback_name T = TypeVar("T") diff --git a/slack/util.py b/slack/util.py index 4f9e5dd..507978d 100644 --- a/slack/util.py +++ b/slack/util.py @@ -1,6 +1,6 @@ from typing import Any, Callable -from .shared import shared +from slack.shared import shared def get_callback_name(callback: Callable[..., Any]) -> str: |