Skip to content

Commit ec77a52

Browse files
committed
fix: Gurt
1 parent 31c09b8 commit ec77a52

4 files changed

Lines changed: 11 additions & 12 deletions

File tree

discord/voice/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"""
1010

1111
from ..errors import MissingVoiceDependencies
12-
from .utils.dependencies import get_missing_voice_dependencies
12+
from ..utils import get_missing_voice_dependencies
1313

1414
if missing := get_missing_voice_dependencies():
1515
raise MissingVoiceDependencies(missing=missing)

discord/voice/client.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,12 @@
4040
from discord.sinks.errors import RecordingException
4141
from discord.utils import MISSING
4242

43+
from ..utils import get_missing_voice_dependencies
4344
from ._types import VoiceProtocol
4445
from .enums import OpCodes
4546
from .receive import AudioReader
4647
from .state import VoiceConnectionState
47-
from .utils.dependencies import HAS_DAVEY, HAS_NACL, get_missing_voice_dependencies
48+
from .utils.dependencies import HAS_DAVEY, HAS_NACL
4849

4950
if HAS_NACL:
5051
import nacl.secret

tests/voice/test_dependency_behavior.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,13 @@
2727
import pytest
2828

2929
import discord
30-
from discord.voice.utils import dependencies as voice_dependencies
3130

3231

3332
def test_client_warns_once_when_voice_dependencies_are_missing(caplog):
34-
if not voice_dependencies.get_missing_voice_dependencies():
33+
if not discord.utils.get_missing_voice_dependencies():
3534
pytest.skip("requires an environment without the voice extra")
3635

37-
voice_dependencies.VOICE_DEPENDENCY_WARNING_EMITTED = False
36+
discord.utils.voice_dependency_warning_emitted = False
3837

3938
with caplog.at_level(logging.WARNING, logger="discord.client"):
4039
discord.Client()
@@ -43,16 +42,16 @@ def test_client_warns_once_when_voice_dependencies_are_missing(caplog):
4342
warnings = [
4443
record.getMessage()
4544
for record in caplog.records
46-
if record.name == "discord.client"
45+
if record.name == "discord.utils"
4746
]
4847
assert len(warnings) == 1
4948
assert warnings[0].endswith("voice will NOT be supported")
50-
for dependency in voice_dependencies.get_missing_voice_dependencies():
49+
for dependency in discord.utils.get_missing_voice_dependencies():
5150
assert dependency in warnings[0]
5251

5352

5453
def test_voice_modules_imports_without_voice_dependencies():
55-
if not voice_dependencies.get_missing_voice_dependencies():
54+
if not discord.utils.get_missing_voice_dependencies():
5655
pytest.skip("requires an environment without the voice extra")
5756

5857
__import__("discord")

tests/voice/test_imports.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,13 @@
2727
import pytest
2828

2929
import discord
30-
from discord.voice.utils import dependencies as voice_dependencies
3130

3231

3332
def test_client_does_not_warn_when_voice_dependencies_are_available(caplog):
34-
if voice_dependencies.get_missing_voice_dependencies():
33+
if discord.utils.get_missing_voice_dependencies():
3534
pytest.skip("requires an environment with the voice extra")
3635

37-
voice_dependencies.VOICE_DEPENDENCY_WARNING_EMITTED = False
36+
discord.utils.voice_dependency_warning_emitted = False
3837

3938
with caplog.at_level(logging.WARNING, logger="discord.client"):
4039
discord.Client()
@@ -48,7 +47,7 @@ def test_client_does_not_warn_when_voice_dependencies_are_available(caplog):
4847

4948

5049
def test_voice_modules_import_with_voice_extra():
51-
if voice_dependencies.get_missing_voice_dependencies():
50+
if discord.utils.get_missing_voice_dependencies():
5251
pytest.skip("requires an environment with the voice extra")
5352

5453
__import__("discord.voice")

0 commit comments

Comments
 (0)