Skip to content

Commit 9ce0568

Browse files
FayeDelFayeDel
committed
fix!: Fix circular import from commit c54a35c.
1 parent 0ac9bc2 commit 9ce0568

File tree

9 files changed

+20
-37
lines changed

9 files changed

+20
-37
lines changed

‎interactions/__init__.py‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,6 @@
99
1010
(c) 2021 interactions-py.
1111
"""
12-
from .api.models.channel import * # noqa: F401 F403
13-
from .api.models.flags import * # noqa: F401 F403
14-
from .api.models.guild import * # noqa: F401 F403
15-
from .api.models.gw import * # noqa: F401 F403
16-
from .api.models.member import * # noqa: F401 F403
17-
from .api.models.message import * # noqa: F401 F403
18-
from .api.models.misc import * # noqa: F401 F403
19-
from .api.models.presence import * # noqa: F401 F403
20-
from .api.models.role import * # noqa: F401 F403
21-
from .api.models.team import * # noqa: F401 F403
22-
from .api.models.user import * # noqa: F401 F403
12+
from .client import * # noqa: F401 F403 isort: skip
13+
from .api import * # noqa: F401 F403
2314
from .base import * # noqa: F401 F403
24-
from .client.bot import * # noqa: F401 F403
25-
from .client.context import * # noqa: F401 F403
26-
from .client.decor import * # noqa: F401 F403
27-
from .client.enums import * # noqa: F401 F403
28-
from .client.models.command import * # noqa: F401 F403
29-
from .client.models.component import * # noqa: F401 F403
30-
from .client.models.misc import * # noqa: F401 F403

‎interactions/api/__init__.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22
interactions.api
33
44
This section of the library maintains and
5-
handles all of the Gateway and HTTP
6-
work.
5+
handles all the Gateway and HTTP work.
76
"""
8-
from ..base import * # noqa: F401 F403
97
from .cache import * # noqa: F401 F403
108
from .enums import * # noqa: F401 F403
119
from .error import * # noqa: F401 F403
12-
from .gateway.client import * # noqa: F401 F403
13-
from .gateway.heartbeat import * # noqa: F401 F403
10+
from .gateway import * # noqa: F401 F403
1411
from .http import * # noqa: F401 F403
1512
from .models import * # noqa: F401 F403

‎interactions/api/gateway/heartbeat.pyi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from asyncio import AbstractEventLoop, Event
22

3-
class _Heartbeat:
3+
class _Heartbeat():
44
event: Event
55
delay: float
66
def __init__(self, loop: AbstractEventLoop) -> None: ...

‎interactions/api/models/gw.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from datetime import datetime
22
from typing import List, Optional, Union
33

4-
from ...models.component import ActionRow, Button, SelectMenu
4+
from ...client.models.component import ActionRow, Button, SelectMenu
55
from .channel import Channel, ThreadMember
66
from .member import Member
77
from .message import Embed, Emoji, Message, MessageInteraction, Sticker

‎interactions/api/models/member.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class Member(DictSerializerMixin):
4545
"permissions",
4646
"communication_disabled_until",
4747
"hoisted_role",
48+
"flags",
4849
"_client",
4950
)
5051

‎interactions/api/models/member.pyi‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ class Member(DictSerializerMixin):
2525
pending: Optional[bool]
2626
permissions: Optional[Permissions]
2727
communication_disabled_until: Optional[datetime.isoformat]
28-
hoisted_role: Any # TODO: post-v4: Investigate what this is for when documented by Discord.
28+
hoisted_role: Any # TODO: Investigate what this is for when documented by Discord.
29+
flags: int # TODO: Investigate what this is for when documented by Discord.
2930
def __init__(self, **kwargs): ...
3031
def __repr__(self) -> str: ...
3132
@property

‎interactions/client/models/command.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from typing import Dict, List, Optional, Union
22

3-
from ..api.models.channel import ChannelType
4-
from ..api.models.misc import DictSerializerMixin, Snowflake
3+
from ...api.models.channel import ChannelType
4+
from ...api.models.misc import DictSerializerMixin, Snowflake
55
from ..enums import ApplicationCommandType, Locale, OptionType, PermissionType
66

77

‎interactions/client/models/component.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from typing import List, Optional
22

3-
from ..api.error import InteractionException
4-
from ..api.models.message import Emoji
5-
from ..api.models.misc import MISSING, DictSerializerMixin
3+
from ...api.error import InteractionException
4+
from ...api.models.message import Emoji
5+
from ...api.models.misc import MISSING, DictSerializerMixin
66
from ..enums import ButtonStyle, ComponentType, TextStyleType
77

88

‎interactions/client/models/misc.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
from typing import Dict, List, Optional
22

3-
from ..api.models.channel import Channel
4-
from ..api.models.member import Member
5-
from ..api.models.message import Attachment, Message
6-
from ..api.models.misc import DictSerializerMixin, Snowflake
7-
from ..api.models.role import Role
8-
from ..api.models.user import User
3+
from ...api.models.channel import Channel
4+
from ...api.models.member import Member
5+
from ...api.models.message import Attachment, Message
6+
from ...api.models.misc import DictSerializerMixin, Snowflake
7+
from ...api.models.role import Role
8+
from ...api.models.user import User
99
from ..enums import ApplicationCommandType, ComponentType, InteractionType
1010
from ..models.command import Option
1111

0 commit comments

Comments
 (0)