fix: This too

Author: Paillat-dev

discord/client.py

@@ -70,8 +70,7 @@
 from .threads import Thread
 from .ui.view import BaseView
 from .user import ClientUser, User
-from .utils import _D, _FETCHABLE, MISSING
-from .voice.utils.dependencies import warn_if_voice_dependencies_missing
+from .utils import _D, _FETCHABLE, MISSING, warn_if_voice_dependencies_missing
 from .webhook import Webhook
 from .widget import Widget
 
@@ -93,7 +92,6 @@
 
 Coro = TypeVar("Coro", bound=Callable[..., Coroutine[Any, Any, Any]])
 
-
 _log = logging.getLogger(__name__)
 
 

discord/utils.py

@@ -93,7 +93,6 @@
 else:
     HAS_MSGSPEC = True
 
-
 __all__ = (
     "parse_time",
     "warn_deprecated",
@@ -140,7 +139,6 @@
     )
     EMOJIS_MAP = {}
 
-
 UNICODE_EMOJIS = set(EMOJIS_MAP.values())
 
 
@@ -176,7 +174,6 @@ class _RequestLike(Protocol):
     AutocompleteContext = Any
     OptionChoice = Any
 
-
 T = TypeVar("T")
 T_co = TypeVar("T_co", covariant=True)
 _Iter = Union[Iterator[T], AsyncIterator[T]]
@@ -1632,3 +1629,39 @@ def users_to_csv(users: Iterable[Snowflake]) -> io.BytesIO:
         A file-like object containing the CSV data.
     """
     return io.BytesIO("\n".join(map(lambda u: str(u.id), users)).encode("utf-8"))
+
+
+voice_dependency_warning_emitted = False
+
+
+def get_missing_voice_dependencies() -> tuple[str, ...]:
+    missing: list[str] = []
+    try:
+        import nacl.secret
+        import nacl.utils
+    except ImportError:
+        missing.append("PyNaCl")
+
+    try:
+        import davey
+    except ImportError:
+        missing.append("davey")
+    return tuple(missing)
+
+
+def warn_if_voice_dependencies_missing() -> None:
+    global voice_dependency_warning_emitted
+    if voice_dependency_warning_emitted:
+        return
+
+    missing = get_missing_voice_dependencies()
+    if not missing:
+        return
+
+    voice_dependency_warning_emitted = True
+    deps = ", ".join(missing)
+    _log.warning(
+        "%s %s not installed, voice will NOT be supported",
+        deps,
+        "is" if len(missing) == 1 else "are",
+    )

discord/voice/utils/dependencies.py

@@ -22,8 +22,6 @@
 DEALINGS IN THE SOFTWARE.
 """
 
-import logging
-
 try:
     import davey
 except ImportError:
@@ -40,34 +38,3 @@
     HAS_NACL = False
 else:
     HAS_NACL = True
-
-VOICE_DEPENDENCY_WARNING_EMITTED = False
-
-_log = logging.getLogger("discord.client")
-
-
-def get_missing_voice_dependencies() -> tuple[str, ...]:
-    missing: list[str] = []
-    if not HAS_NACL:
-        missing.append("PyNaCl")
-    if not HAS_DAVEY:
-        missing.append("davey")
-    return tuple(missing)
-
-
-def warn_if_voice_dependencies_missing() -> None:
-    global VOICE_DEPENDENCY_WARNING_EMITTED
-    if VOICE_DEPENDENCY_WARNING_EMITTED:
-        return
-
-    missing = get_missing_voice_dependencies()
-    if not missing:
-        return
-
-    VOICE_DEPENDENCY_WARNING_EMITTED = True
-    deps = ", ".join(missing)
-    _log.warning(
-        "%s %s not installed, voice will NOT be supported",
-        deps,
-        "is" if len(missing) == 1 else "are",
-    )