♻️ move SnowflakeList to private.py

Author: Paillat-dev

discord/emoji.py

@@ -30,7 +30,8 @@
 from .asset import Asset, AssetMixin
 from .partial_emoji import PartialEmoji, _EmojiTag
 from .user import User
-from .utils import MISSING, SnowflakeList, Undefined, snowflake_time
+from .utils import MISSING, Undefined, snowflake_time
+from .utils.private import SnowflakeList
 
 __all__ = (
     "Emoji",

discord/member.py

@@ -33,7 +33,7 @@
 from typing import TYPE_CHECKING, Any, TypeVar, Union
 
 import discord.abc
-from .utils.private import parse_time
+
 
 from . import utils
 from .activity import ActivityTypes, create_activity
@@ -45,6 +45,7 @@
 from .permissions import Permissions
 from .user import BaseUser, User, _UserTag
 from .utils import MISSING
+from .utils.private import parse_time, SnowflakeList
 
 __all__ = (
     "VoiceState",
@@ -312,7 +313,7 @@ def __init__(self, *, data: MemberWithUserPayload, guild: Guild, state: Connecti
         self.guild: Guild = guild
         self.joined_at: datetime.datetime | None = parse_time(data.get("joined_at"))
         self.premium_since: datetime.datetime | None = parse_time(data.get("premium_since"))
-        self._roles: utils.SnowflakeList = utils.SnowflakeList(map(int, data["roles"]))
+        self._roles: SnowflakeList = SnowflakeList(map(int, data["roles"]))
         self._client_status: dict[str | None, str] = {None: "offline"}
         self.activities: tuple[ActivityTypes, ...] = ()
         self.nick: str | None = data.get("nick", None)
@@ -362,7 +363,7 @@ def _from_message(cls: type[M], *, message: Message, data: MemberPayload) -> M:
     def _update_from_message(self, data: MemberPayload) -> None:
         self.joined_at = parse_time(data.get("joined_at"))
         self.premium_since = parse_time(data.get("premium_since"))
-        self._roles = utils.SnowflakeList(map(int, data["roles"]))
+        self._roles = SnowflakeList(map(int, data["roles"]))
         self.nick = data.get("nick", None)
         self.pending = data.get("pending", False)
 
@@ -387,7 +388,7 @@ def _try_upgrade(
     def _copy(cls: type[M], member: M) -> M:
         self: M = cls.__new__(cls)  # to bypass __init__
 
-        self._roles = utils.SnowflakeList(member._roles, is_sorted=True)
+        self._roles = SnowflakeList(member._roles, is_sorted=True)
         self.joined_at = member.joined_at
         self.premium_since = member.premium_since
         self._client_status = member._client_status.copy()
@@ -424,7 +425,7 @@ def _update(self, data: MemberPayload) -> None:
             pass
 
         self.premium_since = parse_time(data.get("premium_since"))
-        self._roles = utils.SnowflakeList(map(int, data["roles"]))
+        self._roles = SnowflakeList(map(int, data["roles"]))
         self._avatar = data.get("avatar")
         self._banner = data.get("banner")
         self.communication_disabled_until = parse_time(data.get("communication_disabled_until"))

discord/utils/__init__.py

@@ -25,12 +25,8 @@
 
 from __future__ import annotations
 
-import array
 import collections.abc
-import datetime
 import json
-import re
-from bisect import bisect_left
 from inspect import signature as _signature
 from typing import (
     TYPE_CHECKING,
@@ -40,7 +36,6 @@
     Generic,
     Iterable,
     Iterator,
-    Literal,
     Mapping,
     Protocol,
     Sequence,
@@ -322,37 +317,3 @@ def get_slots(cls: type[Any]) -> Iterator[str]:
             yield from mro.__slots__
         except AttributeError:
             continue
-
-
-class SnowflakeList(array.array):
-    """Internal data storage class to efficiently store a list of snowflakes.
-
-    This should have the following characteristics:
-
-    - Low memory usage
-    - O(n) iteration (obviously)
-    - O(n log n) initial creation if data is unsorted
-    - O(log n) search and indexing
-    - O(n) insertion
-    """
-
-    __slots__ = ()
-
-    if TYPE_CHECKING:
-
-        def __init__(self, data: Iterable[int], *, is_sorted: bool = False): ...
-
-    def __new__(cls, data: Iterable[int], *, is_sorted: bool = False):
-        return array.array.__new__(cls, "Q", data if is_sorted else sorted(data))  # type: ignore
-
-    def add(self, element: int) -> None:
-        i = bisect_left(self, element)
-        self.insert(i, element)
-
-    def get(self, element: int) -> int | None:
-        i = bisect_left(self, element)
-        return self[i] if i != len(self) and self[i] == element else None
-
-    def has(self, element: int) -> bool:
-        i = bisect_left(self, element)
-        return i != len(self) and self[i] == element

discord/utils/private.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import array
 import asyncio
 import datetime
 import functools
@@ -8,6 +9,7 @@
 import types
 import unicodedata
 import warnings
+from _bisect import bisect_left
 from base64 import b64encode
 from inspect import isawaitable
 from typing import (
@@ -411,3 +413,37 @@ async def sane_wait_for(futures: Iterable[Awaitable[T]], *, timeout: float) -> s
         raise asyncio.TimeoutError()
 
     return done
+
+
+class SnowflakeList(array.array):
+    """Internal data storage class to efficiently store a list of snowflakes.
+
+    This should have the following characteristics:
+
+    - Low memory usage
+    - O(n) iteration (obviously)
+    - O(n log n) initial creation if data is unsorted
+    - O(log n) search and indexing
+    - O(n) insertion
+    """
+
+    __slots__ = ()
+
+    if TYPE_CHECKING:
+
+        def __init__(self, data: Iterable[int], *, is_sorted: bool = False): ...
+
+    def __new__(cls, data: Iterable[int], *, is_sorted: bool = False):
+        return array.array.__new__(cls, "Q", data if is_sorted else sorted(data))  # type: ignore
+
+    def add(self, element: int) -> None:
+        i = bisect_left(self, element)
+        self.insert(i, element)
+
+    def get(self, element: int) -> int | None:
+        i = bisect_left(self, element)
+        return self[i] if i != len(self) and self[i] == element else None
+
+    def has(self, element: int) -> bool:
+        i = bisect_left(self, element)
+        return i != len(self) and self[i] == element