Skip to content

Commit a402fcf

Browse files
committed
Merge branch 'master' into viewless-components
2 parents 14bf354 + 0f7f84d commit a402fcf

30 files changed

+71
-27
lines changed

CHANGELOG-V3.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,20 @@ release.
1414

1515
### Removed
1616

17+
- `utils.filter_params`
18+
- `utils.sleep_until` use `asyncio.sleep` combined with `datetime.datetime` instead
19+
- `utils.compute_timedelta` use the `datetime` module instead
20+
- `utils.resolve_invite`
21+
- `utils.resolve_template`
22+
- `utils.parse_time` use `datetime.datetime.fromisoformat` instead
23+
- `utils.time_snowflake` use `utils.generate_snowflake` instead
24+
- `utils.warn_deprecated`
25+
- `utils.deprecated`
26+
- `utils.get` use `utils.find` with `lambda i: i.attr == val` instead
27+
- `AsyncIterator.get` use `AsyncIterator.find` with `lambda i: i.attr == val` instead
28+
- `utils.as_chunks` use `itertools.batched` on Python 3.12+ or your own implementation
29+
instead
30+
1731
- `Interaction.original_message` use `Interaction.original_response` instead
1832
- `Interaction.edit_original_message` use `Interaction.edit_original_response` instead
1933
- `Interaction.delete_original_message` use `Interaction.delete_original_response`

discord/__version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535

3636
from typing import Literal, NamedTuple
3737

38-
from ._version import __version__, __version_tuple__
3938
from .utils.private import deprecated
39+
from ._version import __version__, __version_tuple__
4040

4141

4242
class AdvancedVersionInfo(TypedDict):

discord/abc.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
runtime_checkable,
4242
)
4343

44+
from .utils.private import warn_deprecated
4445
from . import utils
4546
from .context_managers import Typing
4647
from .enums import ChannelType

discord/appinfo.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
from typing import TYPE_CHECKING
2929

30+
from .utils.private import warn_deprecated, get_as_snowflake
3031
from . import utils
3132
from .asset import Asset
3233
from .permissions import Permissions

discord/audit_logs.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727

2828
from functools import cached_property
2929
from typing import TYPE_CHECKING, Any, Callable, ClassVar, Generator, TypeVar
30+
from functools import cached_property
3031

32+
from .utils.private import get_as_snowflake
3133
from . import enums, utils
3234
from .asset import Asset
3335
from .automod import AutoModAction, AutoModTriggerMetadata

discord/bot.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
from .shard import AutoShardedClient
6666
from .types import interactions
6767
from .user import User
68-
from .utils import MISSING, Undefined, find
69-
from .utils.private import async_all, maybe_awaitable
68+
from .utils import MISSING, find
69+
from .utils.private import async_all
7070

7171
if TYPE_CHECKING:
7272
from .member import Member

discord/channel.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939

4040
import discord.abc
4141

42+
from .utils.private import bytes_to_base64_data, get_as_snowflake, copy_doc
4243
from . import utils
4344
from .asset import Asset
4445
from .components import AnyComponent

discord/client.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
from discord.banners import print_banner, start_logging
3939

4040
from . import utils
41+
from .utils.private import resolve_invite, resolve_template, bytes_to_base64_data, SequenceProxy
4142
from .activity import ActivityTypes, BaseActivity, create_activity
4243
from .appinfo import AppInfo, PartialAppInfo
4344
from .application_role_connection import ApplicationRoleConnectionMetadata

discord/commands/context.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@
5252
from ..webhook import WebhookMessage
5353
from .core import ApplicationCommand, Option
5454

55+
from typing import Callable, Awaitable
56+
5557
from ..utils.private import copy_doc
5658

5759
T = TypeVar("T")

discord/embeds.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import datetime
2929
from typing import TYPE_CHECKING, Any, Mapping, TypeVar
3030

31+
from .utils.private import parse_time
3132
from . import utils
3233
from .colour import Colour
3334
from .utils.private import parse_time

0 commit comments

Comments
 (0)