Fixed circular import from query package
This commit is contained in:
parent
08ba097aaa
commit
e04d0beb68
@ -15,7 +15,7 @@ __title__ = "cpl_discord"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -23,4 +23,4 @@ from collections import namedtuple
|
|||||||
# imports:
|
# imports:
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_discord"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -59,4 +59,4 @@ def get_discord_collection(services: "ServiceCollectionABC") -> "DiscordCollecti
|
|||||||
# build-ignore-end
|
# build-ignore-end
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_discord.application"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -24,4 +24,4 @@ from collections import namedtuple
|
|||||||
from .discord_bot_application_abc import DiscordBotApplicationABC
|
from .discord_bot_application_abc import DiscordBotApplicationABC
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_discord.command"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -25,4 +25,4 @@ from .discord_command_abc import DiscordCommandABC
|
|||||||
from .discord_commands_meta import DiscordCogMeta
|
from .discord_commands_meta import DiscordCogMeta
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_discord.configuration"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -24,4 +24,4 @@ from collections import namedtuple
|
|||||||
from .discord_bot_settings import DiscordBotSettings
|
from .discord_bot_settings import DiscordBotSettings
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_discord.container"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -31,4 +31,4 @@ from .thread import Thread
|
|||||||
from .voice_channel import VoiceChannel
|
from .voice_channel import VoiceChannel
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
@ -4,7 +4,7 @@ from cpl_discord.container.container import Container
|
|||||||
from cpl_discord.container.text_channel import TextChannel
|
from cpl_discord.container.text_channel import TextChannel
|
||||||
from cpl_discord.container.voice_channel import VoiceChannel
|
from cpl_discord.container.voice_channel import VoiceChannel
|
||||||
from cpl_discord.helper.to_containers_converter import ToContainersConverter
|
from cpl_discord.helper.to_containers_converter import ToContainersConverter
|
||||||
from cpl_query.extension import List
|
from cpl_query.extension.list import List
|
||||||
|
|
||||||
|
|
||||||
class CategoryChannel(discord.CategoryChannel, Container):
|
class CategoryChannel(discord.CategoryChannel, Container):
|
||||||
|
@ -7,7 +7,7 @@ from cpl_discord.container.role import Role
|
|||||||
from cpl_discord.container.text_channel import TextChannel
|
from cpl_discord.container.text_channel import TextChannel
|
||||||
from cpl_discord.container.voice_channel import VoiceChannel
|
from cpl_discord.container.voice_channel import VoiceChannel
|
||||||
from cpl_discord.helper.to_containers_converter import ToContainersConverter
|
from cpl_discord.helper.to_containers_converter import ToContainersConverter
|
||||||
from cpl_query.extension import List
|
from cpl_query.extension.list import List
|
||||||
|
|
||||||
|
|
||||||
class Guild(Container, discord.Guild):
|
class Guild(Container, discord.Guild):
|
||||||
|
@ -4,7 +4,7 @@ from cpl_discord.container.container import Container
|
|||||||
from cpl_discord.container.member import Member
|
from cpl_discord.container.member import Member
|
||||||
from cpl_discord.container.thread import Thread
|
from cpl_discord.container.thread import Thread
|
||||||
from cpl_discord.helper.to_containers_converter import ToContainersConverter
|
from cpl_discord.helper.to_containers_converter import ToContainersConverter
|
||||||
from cpl_query.extension import List
|
from cpl_query.extension.list import List
|
||||||
|
|
||||||
|
|
||||||
class TextChannel(discord.TextChannel, Container):
|
class TextChannel(discord.TextChannel, Container):
|
||||||
|
@ -3,7 +3,7 @@ import discord
|
|||||||
from cpl_discord.container.container import Container
|
from cpl_discord.container.container import Container
|
||||||
from cpl_discord.container.member import Member
|
from cpl_discord.container.member import Member
|
||||||
from cpl_discord.helper.to_containers_converter import ToContainersConverter
|
from cpl_discord.helper.to_containers_converter import ToContainersConverter
|
||||||
from cpl_query.extension import List
|
from cpl_query.extension.list import List
|
||||||
|
|
||||||
|
|
||||||
class Thread(discord.Thread, Container):
|
class Thread(discord.Thread, Container):
|
||||||
|
@ -3,7 +3,7 @@ import discord
|
|||||||
from cpl_discord.container.container import Container
|
from cpl_discord.container.container import Container
|
||||||
from cpl_discord.container.member import Member
|
from cpl_discord.container.member import Member
|
||||||
from cpl_discord.helper.to_containers_converter import ToContainersConverter
|
from cpl_discord.helper.to_containers_converter import ToContainersConverter
|
||||||
from cpl_query.extension import List
|
from cpl_query.extension.list import List
|
||||||
|
|
||||||
|
|
||||||
class VoiceChannel(discord.VoiceChannel, Container):
|
class VoiceChannel(discord.VoiceChannel, Container):
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
"Version": {
|
"Version": {
|
||||||
"Major": "2023",
|
"Major": "2023",
|
||||||
"Minor": "4",
|
"Minor": "4",
|
||||||
"Micro": "0"
|
"Micro": "0.post1"
|
||||||
},
|
},
|
||||||
"Author": "Sven Heidemann",
|
"Author": "Sven Heidemann",
|
||||||
"AuthorEmail": "sven.heidemann@sh-edraft.de",
|
"AuthorEmail": "sven.heidemann@sh-edraft.de",
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_discord.events"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -69,4 +69,4 @@ from .on_voice_state_update_abc import OnVoiceStateUpdateABC
|
|||||||
from .on_webhooks_update_abc import OnWebhooksUpdateABC
|
from .on_webhooks_update_abc import OnWebhooksUpdateABC
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_discord.helper"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -24,4 +24,4 @@ from collections import namedtuple
|
|||||||
from .to_containers_converter import ToContainersConverter
|
from .to_containers_converter import ToContainersConverter
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_discord.service"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -29,4 +29,4 @@ from .discord_service import DiscordService
|
|||||||
from .discord_service_abc import DiscordServiceABC
|
from .discord_service_abc import DiscordServiceABC
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
@ -5,7 +5,7 @@ from cpl_discord.command.discord_command_abc import DiscordCommandABC
|
|||||||
from cpl_discord.discord_event_types_enum import DiscordEventTypesEnum
|
from cpl_discord.discord_event_types_enum import DiscordEventTypesEnum
|
||||||
from cpl_discord.service.command_error_handler_service import CommandErrorHandlerService
|
from cpl_discord.service.command_error_handler_service import CommandErrorHandlerService
|
||||||
from cpl_discord.service.discord_collection_abc import DiscordCollectionABC
|
from cpl_discord.service.discord_collection_abc import DiscordCollectionABC
|
||||||
from cpl_query.extension import List
|
from cpl_query.extension.list import List
|
||||||
|
|
||||||
|
|
||||||
class DiscordCollection(DiscordCollectionABC):
|
class DiscordCollection(DiscordCollectionABC):
|
||||||
|
@ -2,7 +2,7 @@ from abc import ABC, abstractmethod
|
|||||||
from typing import Type
|
from typing import Type
|
||||||
|
|
||||||
from cpl_discord.command import DiscordCommandABC
|
from cpl_discord.command import DiscordCommandABC
|
||||||
from cpl_query.extension import List
|
from cpl_query.extension.list import List
|
||||||
|
|
||||||
|
|
||||||
class DiscordCollectionABC(ABC):
|
class DiscordCollectionABC(ABC):
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_query"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -23,4 +23,4 @@ from collections import namedtuple
|
|||||||
# imports:
|
# imports:
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_query.base"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -28,4 +28,4 @@ from .queryable_abc import QueryableABC
|
|||||||
from .sequence import Sequence
|
from .sequence import Sequence
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
@ -1,14 +1,14 @@
|
|||||||
from collections.abc import Callable
|
from collections.abc import Callable
|
||||||
|
|
||||||
|
from cpl_query.base.queryable_abc import QueryableABC
|
||||||
from cpl_query.base.ordered_queryable_abc import OrderedQueryableABC
|
from cpl_query.base.ordered_queryable_abc import OrderedQueryableABC
|
||||||
from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument
|
from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument
|
||||||
from cpl_query.iterable.iterable import Iterable
|
|
||||||
|
|
||||||
|
|
||||||
class OrderedQueryable(OrderedQueryableABC):
|
class OrderedQueryable(OrderedQueryableABC):
|
||||||
r"""Implementation of :class: `cpl_query.base.ordered_queryable_abc.OrderedQueryableABC`"""
|
r"""Implementation of :class: `cpl_query.base.ordered_queryable_abc.OrderedQueryableABC`"""
|
||||||
|
|
||||||
def __init__(self, _t: type, _values: Iterable = None, _func: Callable = None):
|
def __init__(self, _t: type, _values: QueryableABC = None, _func: Callable = None):
|
||||||
OrderedQueryableABC.__init__(self, _t, _values, _func)
|
OrderedQueryableABC.__init__(self, _t, _values, _func)
|
||||||
|
|
||||||
def then_by(self, _func: Callable) -> OrderedQueryableABC:
|
def then_by(self, _func: Callable) -> OrderedQueryableABC:
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
"Version": {
|
"Version": {
|
||||||
"Major": "2023",
|
"Major": "2023",
|
||||||
"Minor": "4",
|
"Minor": "4",
|
||||||
"Micro": "0"
|
"Micro": "0.post1"
|
||||||
},
|
},
|
||||||
"Author": "Sven Heidemann",
|
"Author": "Sven Heidemann",
|
||||||
"AuthorEmail": "sven.heidemann@sh-edraft.de",
|
"AuthorEmail": "sven.heidemann@sh-edraft.de",
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_query.enumerable"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -25,4 +25,4 @@ from .enumerable import Enumerable
|
|||||||
from .enumerable_abc import EnumerableABC
|
from .enumerable_abc import EnumerableABC
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_query.extension"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -24,4 +24,4 @@ from collections import namedtuple
|
|||||||
from .list import List
|
from .list import List
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_query.iterable"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -25,4 +25,4 @@ from .iterable_abc import IterableABC
|
|||||||
from .iterable import Iterable
|
from .iterable import Iterable
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
Loading…
Reference in New Issue
Block a user